summaryrefslogtreecommitdiffstats
path: root/native/src/widget/image
diff options
context:
space:
mode:
authorLibravatar Héctor Ramón Jiménez <hector0193@gmail.com>2022-12-20 11:31:25 +0100
committerLibravatar Héctor Ramón Jiménez <hector0193@gmail.com>2022-12-20 11:31:25 +0100
commit6bb01b727611b83592f96b2b89371a12e7ce54d8 (patch)
treec75ba7d21b0bec1f5000b6e4ababff923d09387c /native/src/widget/image
parente0c728c62c6fd9496de1d442e7476e24fc5e9023 (diff)
downloadiced-6bb01b727611b83592f96b2b89371a12e7ce54d8.tar.gz
iced-6bb01b727611b83592f96b2b89371a12e7ce54d8.tar.bz2
iced-6bb01b727611b83592f96b2b89371a12e7ce54d8.zip
Fix `clippy` lints for Rust 1.66
Diffstat (limited to 'native/src/widget/image')
-rw-r--r--native/src/widget/image/viewer.rs13
1 files changed, 5 insertions, 8 deletions
diff --git a/native/src/widget/image/viewer.rs b/native/src/widget/image/viewer.rs
index 9c83287e..fdbd3216 100644
--- a/native/src/widget/image/viewer.rs
+++ b/native/src/widget/image/viewer.rs
@@ -170,8 +170,7 @@ where
} else {
state.scale / (1.0 + self.scale_step)
})
- .max(self.min_scale)
- .min(self.max_scale);
+ .clamp(self.min_scale, self.max_scale);
let image_size = image_size(
renderer,
@@ -251,16 +250,14 @@ where
let x = if bounds.width < image_size.width {
(state.starting_offset.x - delta.x)
- .min(hidden_width)
- .max(-hidden_width)
+ .clamp(-hidden_width, hidden_width)
} else {
0.0
};
let y = if bounds.height < image_size.height {
(state.starting_offset.y - delta.y)
- .min(hidden_height)
- .max(-hidden_height)
+ .clamp(-hidden_height, hidden_height)
} else {
0.0
};
@@ -374,8 +371,8 @@ impl State {
(image_size.height - bounds.height / 2.0).max(0.0).round();
Vector::new(
- self.current_offset.x.min(hidden_width).max(-hidden_width),
- self.current_offset.y.min(hidden_height).max(-hidden_height),
+ self.current_offset.x.clamp(-hidden_width, hidden_width),
+ self.current_offset.y.clamp(-hidden_height, hidden_height),
)
}