me/iced
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix clippy lints for Rust 1.66

Browse source
This commit is contained in:
Héctor Ramón Jiménez 2022-12-20 11:31:25 +01:00
parent e0c728c62c
commit 6bb01b7276
No known key found for this signature in database
GPG key ID: 140CC052C94F138E
10 changed files with 28 additions and 40 deletions
Download patch file Download diff file Expand all files Collapse all files

13
native/src/widget/image/viewer.rs
View file

@ -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),
)
}