lazzexus/Loupe
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

edit/crop: Apply crop on rotation and flip

Browse source
This commit is contained in:
Sophie Herold 2025-01-17 23:23:59 +01:00
parent e66203783e
commit 9cb08d288d
2 changed files with 14 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/widgets/edit/crop.rs
View file

@ -219,6 +219,7 @@ mod imp {
fn selection_changed(&self) { fn selection_changed(&self) {
let crop_area_image_coord = self.crop_area_image_coord(); let crop_area_image_coord = self.crop_area_image_coord();
if self.selection.is_in_user_change() { if self.selection.is_in_user_change() {
log::trace!("Setting crop are in image coordinates to {crop_area_image_coord:?}");
self.crop_area_image_coord.replace(crop_area_image_coord); self.crop_area_image_coord.replace(crop_area_image_coord);
} }
@ -285,24 +286,28 @@ mod imp {
} }
fn apply_mirror_horizontally(&self) { fn apply_mirror_horizontally(&self) {
self.apply_crop();
self.add_operation(Operation::MirrorHorizontally); self.add_operation(Operation::MirrorHorizontally);
self.reset_selection(); self.reset_selection();
} }
fn apply_mirror_vertically(&self) { fn apply_mirror_vertically(&self) {
self.apply_crop();
self.add_operation(Operation::MirrorVertically); self.add_operation(Operation::MirrorVertically);
self.reset_selection(); self.reset_selection();
} }
fn apply_rotate_cw(&self) { fn apply_rotate_cw(&self) {
self.apply_crop();
self.add_operation(Operation::Rotate(gufo_common::orientation::Rotation::_270)); self.add_operation(Operation::Rotate(gufo_common::orientation::Rotation::_270));
self.reset_selection(); self.reset_selection();
} }
fn apply_rotate_ccw(&self) { fn apply_rotate_ccw(&self) {
self.apply_crop();
self.add_operation(Operation::Rotate(gufo_common::orientation::Rotation::_90)); self.add_operation(Operation::Rotate(gufo_common::orientation::Rotation::_90));
self.reset_selection(); self.reset_selection();

9
src/widgets/edit/crop_selection.rs
View file

@ -161,6 +161,8 @@ mod imp {
pub(super) selection_in_resize: Cell<Option<InResize>>, pub(super) selection_in_resize: Cell<Option<InResize>>,
/// Set while in drag gesture for moving crop area /// Set while in drag gesture for moving crop area
pub(super) selection_in_move: Cell<Option<InMove>>, pub(super) selection_in_move: Cell<Option<InMove>>,
/// Set while resetting the crop area
pub(super) selection_in_reset: Cell<bool>,
// Animates changes between different fixed aspect ratios // Animates changes between different fixed aspect ratios
aspect_ratio_animation: OnceCell<adw::TimedAnimation>, aspect_ratio_animation: OnceCell<adw::TimedAnimation>,
@ -774,11 +776,16 @@ impl LpEditCropSelection {
} }
pub fn reset(&self, x: f64, y: f64, width: f64, height: f64) { pub fn reset(&self, x: f64, y: f64, width: f64, height: f64) {
let imp = self.imp();
imp.selection_in_reset.replace(true);
self.set_image_area(x, y, width, height); self.set_image_area(x, y, width, height);
self.set_crop_size(0., 0., width, height); self.set_crop_size(0., 0., width, height);
imp.selection_in_reset.replace(false);
} }
pub fn set_image_area(&self, x: f64, y: f64, width: f64, height: f64) { pub fn set_image_area(&self, x: f64, y: f64, width: f64, height: f64) {
log::trace!("Setting image area to ({x}, {y}, {width}, {height})");
self.set_margin_start(x as i32); self.set_margin_start(x as i32);
self.set_margin_top(y as i32); self.set_margin_top(y as i32);
self.set_total_width(width as i32); self.set_total_width(width as i32);
@ -786,6 +793,7 @@ impl LpEditCropSelection {
} }
pub fn set_crop_size(&self, x: f64, y: f64, width: f64, height: f64) { pub fn set_crop_size(&self, x: f64, y: f64, width: f64, height: f64) {
log::trace!("Setting crop area to ({x}, {y}, {width}, {height})");
self.set_crop_x(x as f32); self.set_crop_x(x as f32);
self.set_crop_y(y as f32); self.set_crop_y(y as f32);
self.set_crop_width(width as f32); self.set_crop_width(width as f32);
@ -803,6 +811,7 @@ impl LpEditCropSelection {
pub fn is_in_user_change(&self) -> bool { pub fn is_in_user_change(&self) -> bool {
self.imp().selection_in_resize.get().is_some() self.imp().selection_in_resize.get().is_some()
|| self.imp().selection_in_move.get().is_some() || self.imp().selection_in_move.get().is_some()
|| self.imp().selection_in_reset.get()
|| self.imp().aspect_ratio_animation().state() == adw::AnimationState::Playing || self.imp().aspect_ratio_animation().state() == adw::AnimationState::Playing
} }
} }