Merge pull request #694 from hecrj/fix/image-viewer-event-capturing

Capture relevant events in `image::Viewer`
This commit is contained in:
Héctor Ramón 2021-01-12 20:06:32 +01:00 committed by GitHub
commit 92d647d1a6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 15 additions and 5 deletions

View File

@ -209,15 +209,23 @@ where
} }
} }
} }
event::Status::Captured
} }
Event::Mouse(mouse::Event::ButtonPressed(mouse::Button::Left)) Event::Mouse(mouse::Event::ButtonPressed(mouse::Button::Left))
if is_mouse_over => if is_mouse_over =>
{ {
self.state.cursor_grabbed_at = Some(cursor_position); self.state.cursor_grabbed_at = Some(cursor_position);
self.state.starting_offset = self.state.current_offset; self.state.starting_offset = self.state.current_offset;
event::Status::Captured
} }
Event::Mouse(mouse::Event::ButtonReleased(mouse::Button::Left)) => { Event::Mouse(mouse::Event::ButtonReleased(mouse::Button::Left))
self.state.cursor_grabbed_at = None if self.state.cursor_grabbed_at.is_some() =>
{
self.state.cursor_grabbed_at = None;
event::Status::Captured
} }
Event::Mouse(mouse::Event::CursorMoved { position }) => { Event::Mouse(mouse::Event::CursorMoved { position }) => {
if let Some(origin) = self.state.cursor_grabbed_at { if let Some(origin) = self.state.cursor_grabbed_at {
@ -251,12 +259,14 @@ where
}; };
self.state.current_offset = Vector::new(x, y); self.state.current_offset = Vector::new(x, y);
event::Status::Captured
} else {
event::Status::Ignored
} }
} }
_ => {} _ => event::Status::Ignored,
} }
event::Status::Ignored
} }
fn draw( fn draw(