diff options
author | 2020-04-30 04:53:15 +0200 | |
---|---|---|
committer | 2020-04-30 04:53:15 +0200 | |
commit | e55cd9652e7c7aea4dc2c6ccb83769246d1a808e (patch) | |
tree | 6383563bab65b5feed50873c447a40da929d90bf /native/src/widget/scrollable.rs | |
parent | e139aae1439d362ada017a05c9554eaae0883888 (diff) | |
download | iced-e55cd9652e7c7aea4dc2c6ccb83769246d1a808e.tar.gz iced-e55cd9652e7c7aea4dc2c6ccb83769246d1a808e.tar.bz2 iced-e55cd9652e7c7aea4dc2c6ccb83769246d1a808e.zip |
Split `Input` mouse event by `ButtonState`
Diffstat (limited to 'native/src/widget/scrollable.rs')
-rw-r--r-- | native/src/widget/scrollable.rs | 20 |
1 files changed, 8 insertions, 12 deletions
diff --git a/native/src/widget/scrollable.rs b/native/src/widget/scrollable.rs index 393095a4..da11c50c 100644 --- a/native/src/widget/scrollable.rs +++ b/native/src/widget/scrollable.rs @@ -1,9 +1,7 @@ //! Navigate an endless amount of content with a scrollbar. use crate::{ - column, - input::{mouse, ButtonState}, - layout, Align, Clipboard, Column, Element, Event, Hasher, Layout, Length, - Point, Rectangle, Size, Widget, + column, input::mouse, layout, Align, Clipboard, Column, Element, Event, + Hasher, Layout, Length, Point, Rectangle, Size, Widget, }; use std::{f32, hash::Hash, u32}; @@ -188,10 +186,9 @@ where if self.state.is_scroller_grabbed() { match event { - Event::Mouse(mouse::Event::Input { - button: mouse::Button::Left, - state: ButtonState::Released, - }) => { + Event::Mouse(mouse::Event::ButtonReleased( + mouse::Button::Left, + )) => { self.state.scroller_grabbed_at = None; } Event::Mouse(mouse::Event::CursorMoved { .. }) => { @@ -212,10 +209,9 @@ where } } else if is_mouse_over_scrollbar { match event { - Event::Mouse(mouse::Event::Input { - button: mouse::Button::Left, - state: ButtonState::Pressed, - }) => { + Event::Mouse(mouse::Event::ButtonPressed( + mouse::Button::Left, + )) => { if let Some(scrollbar) = scrollbar { if let Some(scroller_grabbed_at) = scrollbar.grab_scroller(cursor_position) |