reivilibre/iced-mobile
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Remove unnecessary Option in image::viewer::State

Browse Source
This commit is contained in:
Héctor Ramón Jiménez 2020-12-18 10:55:18 +01:00
parent e6f23e3771
commit 64af860ad2
1 changed files with 24 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
native/src/widget/image/viewer.rs
View File

@ -136,7 +136,7 @@ impl<'a> Viewer<'a> {
let ratio = width_ratio.min(height_ratio); let ratio = width_ratio.min(height_ratio);
let scale = self.state.scale.unwrap_or(1.0); let scale = self.state.scale;
if ratio < 1.0 { if ratio < 1.0 {
(dimensions.0 * ratio * scale, dimensions.1 * ratio * scale) (dimensions.0 * ratio * scale, dimensions.1 * ratio * scale)
@ -222,29 +222,24 @@ where
match delta { match delta {
mouse::ScrollDelta::Lines { y, .. } mouse::ScrollDelta::Lines { y, .. }
| mouse::ScrollDelta::Pixels { y, .. } => { | mouse::ScrollDelta::Pixels { y, .. } => {
let previous_scale = self.state.scale.unwrap_or(1.0); let previous_scale = self.state.scale;
if y < 0.0 && previous_scale > self.min_scale if y < 0.0 && previous_scale > self.min_scale
|| y > 0.0 && previous_scale < self.max_scale || y > 0.0 && previous_scale < self.max_scale
{ {
self.state.scale = Some( self.state.scale = (if y > 0.0 {
(if y > 0.0 { self.state.scale * (1.0 + self.scale_step)
self.state.scale.unwrap_or(1.0)
* (1.0 + self.scale_step)
} else { } else {
self.state.scale.unwrap_or(1.0) self.state.scale / (1.0 + self.scale_step)
/ (1.0 + self.scale_step)
}) })
.max(self.min_scale) .max(self.min_scale)
.min(self.max_scale), .min(self.max_scale);
);
let image_size = let image_size =
self.image_size(renderer, bounds.size()); self.image_size(renderer, bounds.size());
let factor = self.state.scale.unwrap() let factor =
/ previous_scale self.state.scale / previous_scale - 1.0;
- 1.0;
let cursor_to_center = relative_cursor_position( let cursor_to_center = relative_cursor_position(
cursor_position, cursor_position,
@ -343,14 +338,25 @@ where
/// The local state of a [`Viewer`]. /// The local state of a [`Viewer`].
/// ///
/// [`Viewer`]: struct.Viewer.html /// [`Viewer`]: struct.Viewer.html
#[derive(Debug, Clone, Copy, Default)] #[derive(Debug, Clone, Copy)]
pub struct State { pub struct State {
scale: Option<f32>, scale: f32,
starting_offset: Vector, starting_offset: Vector,
current_offset: Vector, current_offset: Vector,
starting_cursor_pos: Option<Point>, starting_cursor_pos: Option<Point>,
} }
impl Default for State {
fn default() -> Self {
Self {
scale: 1.0,
starting_offset: Vector::default(),
current_offset: Vector::default(),
starting_cursor_pos: None,
}
}
}
impl State { impl State {
/// Creates a new [`State`]. /// Creates a new [`State`].
/// ///