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

image: Also snap into 'best-fit' if close to it

Browse source 
If only 1/4 of a zoom step zoomed in, assume best-fit.
This helps with floating point precision when zooming in and
out again. It also removes akward other minimal zoom steps.
This change centralizes part of the best-fit detection.
This commit is contained in:
Sophie Herold 2022-11-28 23:43:56 +01:00
parent c1a3cc353d
commit 78e528d299
1 changed files with 14 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

27
src/widgets/image.rs
View file

@ -317,10 +317,6 @@ mod imp {
rotation_gesture.connect_end(glib::clone!(@weak obj => move |_, _| {
log::debug!("Rotate gesture ended");
// Set best-fit here as well, since this can end before zoom gesture.
// The value of best-fit is relevant for `rotate_by`
obj.set_best_fit(obj.zoom() < obj.zoom_level_best_fit());
let angle = (obj.rotation() / 90.).round() * 90. - obj.imp().rotation_target.get();
obj.rotate_by(angle);
}));
@ -362,10 +358,8 @@ mod imp {
let rotation_target = (obj.rotation() / 90.).round() * 90.;
if obj.zoom() < obj.zoom_level_best_fit_for_rotation(rotation_target) {
obj.set_best_fit(true);
obj.zoom_to(obj.zoom_level_best_fit_for_rotation(rotation_target));
} else {
obj.set_best_fit(false);
// rubberband if over highest zoom level and sets `zoom_target`
obj.zoom_to(obj.zoom());
};
@ -737,8 +731,6 @@ impl LpImage {
pub fn zoom_in(&self) {
let zoom = self.zoom() * ZOOM_FACTOR_BUTTON;
self.set_best_fit(false);
self.zoom_to(zoom);
}
@ -746,9 +738,7 @@ impl LpImage {
///
/// Used by buttons
pub fn zoom_out(&self) {
let zoom = (self.zoom() / ZOOM_FACTOR_BUTTON).max(self.zoom_level_best_fit());
self.set_best_fit(zoom == self.zoom_level_best_fit());
let zoom = self.zoom() / ZOOM_FACTOR_BUTTON;
self.zoom_to(zoom);
}
@ -769,6 +759,19 @@ impl LpImage {
self.set_max_zoom(false);
}
// If image is only 1/4 of a zoom step away from best-fit, also
// activate best-fit. This avoids bugs with floating point precision
// and removes akward minimal zoom steps.
let extended_best_fit_threshold =
self.zoom_level_best_fit() * (1. + (ZOOM_FACTOR_BUTTON - 1.) / 4.);
if zoom <= extended_best_fit_threshold {
zoom = self.zoom_level_best_fit();
self.set_best_fit(true);
} else {
self.set_best_fit(false);
}
log::debug!("Zoom to {zoom:.3}");
self.imp().zoom_target.set(zoom);
@ -794,8 +797,6 @@ impl LpImage {
.zoom_hscrollbar_transition
.set(current_vborder.signum() != target_vborder.signum() && current_vborder != 0.);
self.set_best_fit(zoom <= self.zoom_level_best_fit());
let animation = self.zoom_animation();
animation.set_value_from(self.zoom());