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

code: Use chained if-let's

Browse source
This commit is contained in:
Sophie Herold 2026-01-29 19:04:26 +01:00
parent f806bbd484
commit 8972c5efb9
12 changed files with 219 additions and 235 deletions
Download patch file Download diff file Expand all files Collapse all files

20
src/widgets/image/input_handling.rs
View file

@ -303,17 +303,17 @@ impl imp::LpImage {
let zoom = imp.zoom_target.get() * scale;
// Move image with fingers on touchscreens
if gesture.device().map(|x| x.source()) == Some(gdk::InputSource::Touchscreen) {
if let p1 @ Some((x1, y1)) = gesture.bounding_box_center() {
if let Some((x0, y0)) = imp.zoom_gesture_center.get() {
imp.set_hadj_value(imp.hadj_value() + x0 - x1);
imp.set_vadj_value(imp.vadj_value() + y0 - y1);
} else {
tracing::warn!("Zoom bounding box center: No previous value");
}
imp.zoom_gesture_center.set(p1);
if gesture.device().map(|x| x.source()) == Some(gdk::InputSource::Touchscreen)
&& let p1 @ Some((x1, y1)) = gesture.bounding_box_center()
{
if let Some((x0, y0)) = imp.zoom_gesture_center.get() {
imp.set_hadj_value(imp.hadj_value() + x0 - x1);
imp.set_vadj_value(imp.vadj_value() + y0 - y1);
} else {
tracing::warn!("Zoom bounding box center: No previous value");
}
imp.zoom_gesture_center.set(p1);
}
let zoom_out_threshold = 1. / ZOOM_GESTURE_LOCK_THRESHOLD;

43
src/widgets/image/loading.rs
View file

@ -186,19 +186,19 @@ impl imp::LpImage {
}
pub(super) fn request_tiles(&self) {
if let Some(decoder) = self.decoder.borrow().as_ref() {
if self.zoom_animation().state() != adw::AnimationState::Playing {
// Force minimum tile size of 1000x1000 since with smaller
// tiles the tiled rendering advantage disappears
let x_inset = f32::min(-3., (self.viewport().width() - 1000.) / 2.);
let y_inset = f32::min(-3., (self.viewport().height() - 1000.) / 2.);
if let Some(decoder) = self.decoder.borrow().as_ref()
&& self.zoom_animation().state() != adw::AnimationState::Playing
{
// Force minimum tile size of 1000x1000 since with smaller
// tiles the tiled rendering advantage disappears
let x_inset = f32::min(-3., (self.viewport().width() - 1000.) / 2.);
let y_inset = f32::min(-3., (self.viewport().height() - 1000.) / 2.);
decoder.request(crate::decoder::TileRequest {
viewport: self.viewport().inset_r(x_inset, y_inset),
area: self.preload_area(),
zoom: self.zoom_target.get(),
});
}
decoder.request(crate::decoder::TileRequest {
viewport: self.viewport().inset_r(x_inset, y_inset),
area: self.preload_area(),
zoom: self.zoom_target.get(),
});
}
}
@ -287,19 +287,16 @@ impl imp::LpImage {
async fn check_editable(&self) {
let obj = self.obj();
if let Some(mime_type) = obj.metadata().mime_type() {
if let Ok(supported_formats) = glycin::config::Config::cached()
if let Some(mime_type) = obj.metadata().mime_type()
&& let Ok(supported_formats) = glycin::config::Config::cached()
.await
.editor(&mime_type.as_str().into())
{
if LpEditWindow::REQUIRED_OPERATIONS
.iter()
.all(|x| supported_formats.operations.contains(x))
{
self.editable.set(true);
obj.notify_editable();
}
}
&& LpEditWindow::REQUIRED_OPERATIONS
.iter()
.all(|x| supported_formats.operations.contains(x))
{
self.editable.set(true);
obj.notify_editable();
};
}
}

122
src/widgets/image/rendering.rs
View file

@ -158,62 +158,61 @@ impl WidgetImpl for imp::LpImage {
let image_width = image_width_i32 as f64;
let image_height = image_height_i32 as f64;
if image_width_i32 > 0 && image_height_i32 > 0 {
if let Some((monitor_width, monitor_height)) = self.monitor_size() {
let hidpi_scale = self.scaling();
tracing::trace!("Physical monitor dimensions: {monitor_width} x {monitor_height}");
if image_width_i32 > 0
&& image_height_i32 > 0
&& let Some((monitor_width, monitor_height)) = self.monitor_size()
{
let hidpi_scale = self.scaling();
tracing::trace!("Physical monitor dimensions: {monitor_width} x {monitor_height}");
// areas
let monitor_area = monitor_width * monitor_height;
let logical_monitor_area = monitor_area * hidpi_scale.powi(2);
let image_area = image_width * image_height;
// areas
let monitor_area = monitor_width * monitor_height;
let logical_monitor_area = monitor_area * hidpi_scale.powi(2);
let image_area = image_width * image_height;
let occupy_area_factor = if logical_monitor_area <= SMALL_SCREEN_AREA {
tracing::trace!(
"Small monitor detected: Using {SMALL_OCCUPY_SCREEN} screen area"
);
SMALL_OCCUPY_SCREEN
} else {
tracing::trace!(
"Sufficiently large monitor detected: Using {DEFAULT_OCCUPY_SCREEN} screen area"
);
DEFAULT_OCCUPY_SCREEN
};
let occupy_area_factor = if logical_monitor_area <= SMALL_SCREEN_AREA {
tracing::trace!("Small monitor detected: Using {SMALL_OCCUPY_SCREEN} screen area");
SMALL_OCCUPY_SCREEN
} else {
tracing::trace!(
"Sufficiently large monitor detected: Using {DEFAULT_OCCUPY_SCREEN} screen area"
);
DEFAULT_OCCUPY_SCREEN
};
// factor for width and height that will achieve the desired area
// occupation derived from:
// monitor_area * occupy_area_factor ==
// (image_width * size_scale) * (image_height * size_scale)
let size_scale = f64::sqrt(monitor_area / image_area * occupy_area_factor);
// ensure that we never increase image size
let target_scale = f64::min(1.0, size_scale);
let mut nat_width = image_width * target_scale;
let mut nat_height = image_height * target_scale;
// factor for width and height that will achieve the desired area
// occupation derived from:
// monitor_area * occupy_area_factor ==
// (image_width * size_scale) * (image_height * size_scale)
let size_scale = f64::sqrt(monitor_area / image_area * occupy_area_factor);
// ensure that we never increase image size
let target_scale = f64::min(1.0, size_scale);
let mut nat_width = image_width * target_scale;
let mut nat_height = image_height * target_scale;
// Scale down if targeted occupation does not fit horizontally
// Add some margin to not touch corners
let max_width = monitor_width - 20.;
if nat_width > max_width {
nat_width = max_width;
nat_height = image_height * nat_width / image_width;
}
// Same for vertical size
// Additionally substract some space for HeaderBar and Shell bar
let max_height = monitor_height - (50. + 35. + 20.) * hidpi_scale;
if nat_height > max_height {
nat_height = max_height;
nat_width = image_width * nat_height / image_height;
}
let size = match orientation {
gtk::Orientation::Horizontal => (nat_width / hidpi_scale).round(),
gtk::Orientation::Vertical => (nat_height / hidpi_scale).round(),
_ => unreachable!(),
};
return (0, size as i32, -1, -1);
// Scale down if targeted occupation does not fit horizontally
// Add some margin to not touch corners
let max_width = monitor_width - 20.;
if nat_width > max_width {
nat_width = max_width;
nat_height = image_height * nat_width / image_width;
}
// Same for vertical size
// Additionally substract some space for HeaderBar and Shell bar
let max_height = monitor_height - (50. + 35. + 20.) * hidpi_scale;
if nat_height > max_height {
nat_height = max_height;
nat_width = image_width * nat_height / image_height;
}
let size = match orientation {
gtk::Orientation::Horizontal => (nat_width / hidpi_scale).round(),
gtk::Orientation::Vertical => (nat_height / hidpi_scale).round(),
_ => unreachable!(),
};
return (0, size as i32, -1, -1);
}
// fallback if monitor size or image size is not known:
@ -338,18 +337,17 @@ impl imp::LpImage {
pub fn monitor_size(&self) -> Option<(f64, f64)> {
let obj = self.obj();
if let Some(display) = gdk::Display::default() {
if let Some(surface) = obj.native().and_then(|x| x.surface()) {
if let Some(monitor) = display.monitor_at_surface(&surface) {
let hidpi_scale = self.scaling();
let monitor_geometry = monitor.geometry();
if let Some(display) = gdk::Display::default()
&& let Some(surface) = obj.native().and_then(|x| x.surface())
&& let Some(monitor) = display.monitor_at_surface(&surface)
{
let hidpi_scale = self.scaling();
let monitor_geometry = monitor.geometry();
return Some((
monitor_geometry.width() as f64 * hidpi_scale,
monitor_geometry.height() as f64 * hidpi_scale,
));
}
}
return Some((
monitor_geometry.width() as f64 * hidpi_scale,
monitor_geometry.height() as f64 * hidpi_scale,
));
}
None

16
src/widgets/image/rotation.rs
View file

@ -104,14 +104,14 @@ impl LpImage {
zoom_animation.play();
}
if let Ok(r) = gufo_common::orientation::Rotation::try_from(angle) {
if r != gufo_common::orientation::Rotation::_0 {
tracing::debug!("Editing image to rotate by {r:?}");
let operation = glycin::Operation::Rotate(r);
let editing_queue = &self.imp().editing_queue;
editing_queue.push(operation);
editing_queue.write_to_image(self);
}
if let Ok(r) = gufo_common::orientation::Rotation::try_from(angle)
&& r != gufo_common::orientation::Rotation::_0
{
tracing::debug!("Editing image to rotate by {r:?}");
let operation = glycin::Operation::Rotate(r);
let editing_queue = &self.imp().editing_queue;
editing_queue.push(operation);
editing_queue.write_to_image(self);
}
}
}