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

Pan image::Viewer even if the cursor is out of bounds

Browse source
This commit is contained in:
Héctor Ramón Jiménez 2020-12-18 10:47:29 +01:00
parent 21b10dc103
commit add167d6a0
1 changed files with 66 additions and 75 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -215,92 +215,83 @@ where
let bounds = layout.bounds(); let bounds = layout.bounds();
let is_mouse_over = bounds.contains(cursor_position); let is_mouse_over = bounds.contains(cursor_position);
if is_mouse_over { match event {
match event { Event::Mouse(mouse::Event::WheelScrolled { delta })
Event::Mouse(mouse::Event::WheelScrolled { delta }) => { if is_mouse_over =>
match delta { {
mouse::ScrollDelta::Lines { y, .. } match delta {
| mouse::ScrollDelta::Pixels { y, .. } => { mouse::ScrollDelta::Lines { y, .. }
let previous_scale = | mouse::ScrollDelta::Pixels { y, .. } => {
self.state.scale.unwrap_or(1.0); let previous_scale = self.state.scale.unwrap_or(1.0);
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 = Some(
(if y > 0.0 { (if y > 0.0 {
self.state.scale.unwrap_or(1.0) self.state.scale.unwrap_or(1.0)
* (1.0 + self.scale_pct) * (1.0 + self.scale_pct)
} else { } else {
self.state.scale.unwrap_or(1.0) self.state.scale.unwrap_or(1.0)
/ (1.0 + self.scale_pct) / (1.0 + self.scale_pct)
}) })
.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 = self.state.scale.unwrap()
/ previous_scale / previous_scale
- 1.0; - 1.0;
let cursor_to_center = let cursor_to_center = relative_cursor_position(
relative_cursor_position( cursor_position,
cursor_position, bounds,
bounds, ) - relative_center(bounds);
) - relative_center(bounds);
let adjustment = cursor_to_center * factor let adjustment = cursor_to_center * factor
+ self.state.current_offset * factor; + self.state.current_offset * factor;
self.state.current_offset = Vector::new( self.state.current_offset = Vector::new(
if image_size.width > bounds.width { if image_size.width > bounds.width {
self.state.current_offset.x self.state.current_offset.x + adjustment.x
+ adjustment.x } else {
} else { 0.0
0.0 },
}, if image_size.height > bounds.height {
if image_size.height > bounds.height { self.state.current_offset.y + adjustment.y
self.state.current_offset.y } else {
+ adjustment.y 0.0
} else { },
0.0 );
},
);
}
} }
} }
} }
Event::Mouse(mouse::Event::ButtonPressed(button)) => {
if button == mouse::Button::Left {
self.state.starting_cursor_pos = Some(cursor_position);
self.state.starting_offset = self.state.current_offset;
}
}
Event::Mouse(mouse::Event::ButtonReleased(button)) => {
if button == mouse::Button::Left {
self.state.starting_cursor_pos = None
}
}
Event::Mouse(mouse::Event::CursorMoved { position }) => {
if self.state.is_cursor_clicked() {
let image_size =
self.image_size(renderer, bounds.size());
self.state
.pan(position.x, position.y, bounds, image_size);
}
}
_ => {}
} }
} else if let Event::Mouse(mouse::Event::ButtonReleased(button)) = event Event::Mouse(mouse::Event::ButtonPressed(button))
{ if is_mouse_over =>
if button == mouse::Button::Left { {
self.state.starting_cursor_pos = None; if button == mouse::Button::Left {
self.state.starting_cursor_pos = Some(cursor_position);
self.state.starting_offset = self.state.current_offset;
}
} }
Event::Mouse(mouse::Event::ButtonReleased(button)) => {
if button == mouse::Button::Left {
self.state.starting_cursor_pos = None
}
}
Event::Mouse(mouse::Event::CursorMoved { position }) => {
if self.state.is_cursor_clicked() {
let image_size = self.image_size(renderer, bounds.size());
self.state.pan(position.x, position.y, bounds, image_size);
}
}
_ => {}
} }
event::Status::Ignored event::Status::Ignored