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

edit: Init crop view with selecting complete image

Browse source
This commit is contained in:
Sophie Herold 2024-09-17 21:02:01 +02:00
parent 5b184e6be9
commit 1fc9674cb8
3 changed files with 27 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -103,7 +103,6 @@ mod imp {
obj.child().set_parent(obj); obj.child().set_parent(obj);
obj.set_layout_manager(None::<gtk::LayoutManager>);
self.image.duplicate_from(&obj.original_image()); self.image.duplicate_from(&obj.original_image());
} }
@ -120,12 +119,15 @@ mod imp {
obj.child().allocate(width, height, baseline, None); obj.child().allocate(width, height, baseline, None);
self.selection.set_size( let (x, y, width, height) = (
image.image_rendering_x() as i32, image.image_rendering_x(),
image.image_rendering_y() as i32, image.image_rendering_y(),
image.image_rendering_width() as i32, image.image_rendering_width(),
image.image_rendering_height() as i32, image.image_rendering_height(),
); );
self.selection.ensure_initialized(x, y, width, height);
self.selection.set_size(x, y, width, height);
} }
fn measure(&self, orientation: gtk::Orientation, for_size: i32) -> (i32, i32, i32, i32) { fn measure(&self, orientation: gtk::Orientation, for_size: i32) -> (i32, i32, i32, i32) {

1
src/widgets/edit/crop.ui
View file

@ -62,6 +62,7 @@
<property name="margin-start">18</property> <property name="margin-start">18</property>
<child> <child>
<object class="LpImage" id="image"> <object class="LpImage" id="image">
<property name="sensitive">false</property>
</object> </object>
</child> </child>
<child type="overlay"> <child type="overlay">

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

@ -174,6 +174,8 @@ mod imp {
#[property(get=Self::total_height, set=Self::set_total_height)] #[property(get=Self::total_height, set=Self::set_total_height)]
total_height: PhantomData<i32>, total_height: PhantomData<i32>,
pub(super) initialized: Cell<bool>,
#[property(get, set=Self::set_crop_x)] #[property(get, set=Self::set_crop_x)]
crop_x: Cell<f32>, crop_x: Cell<f32>,
#[property(get, set=Self::set_crop_y)] #[property(get, set=Self::set_crop_y)]
@ -756,13 +758,19 @@ impl LpEditCropSelection {
glib::Object::new() glib::Object::new()
} }
pub fn reset(&self, x: i32, y: i32, width: i32, height: i32) { pub fn ensure_initialized(&self, x: f64, y: f64, width: f64, height: f64) {
let imp = self.imp(); let imp = self.imp();
self.set_margin_start(x); if imp.initialized.get() {
self.set_margin_top(y); return;
self.set_total_width(width); }
self.set_total_height(height);
imp.initialized.set(true);
self.set_margin_start(x as i32);
self.set_margin_top(y as i32);
self.set_total_width(width as i32);
self.set_total_height(height as i32);
imp.set_crop_x(0.); imp.set_crop_x(0.);
imp.set_crop_y(0.); imp.set_crop_y(0.);
@ -770,7 +778,7 @@ impl LpEditCropSelection {
imp.set_crop_height(height as f32); imp.set_crop_height(height as f32);
} }
pub fn set_size(&self, x: i32, y: i32, width: i32, height: i32) { pub fn set_size(&self, x: f64, y: f64, width: f64, height: f64) {
let ratio = width as f32 / self.total_width() as f32; let ratio = width as f32 / self.total_width() as f32;
self.set_crop_x(self.crop_x() * ratio); self.set_crop_x(self.crop_x() * ratio);
@ -778,9 +786,9 @@ impl LpEditCropSelection {
self.set_crop_width(self.crop_width() * ratio); self.set_crop_width(self.crop_width() * ratio);
self.set_crop_height(self.crop_height() * ratio); self.set_crop_height(self.crop_height() * ratio);
self.set_margin_start(x); self.set_margin_start(x as i32);
self.set_margin_top(y); self.set_margin_top(y as i32);
self.set_total_width(width); self.set_total_width(width as i32);
self.set_total_height(height); self.set_total_height(height as i32);
} }
} }