diff options
| author |  Héctor Ramón <hector0193@gmail.com> | 2023-05-23 02:52:14 +0200 |
|---|---|---|
| committer |  GitHub <noreply@github.com> | 2023-05-23 02:52:14 +0200 |
| commit | e31582e59efed3ffc775f2ce12e14dd6c4ec343f (patch) | |
| tree | 0cf43a42a2c498778941aaa0606fafcba5dc3825 | |
| parent | f0073e3d71bb4866d204c8c8ba43a608380b7e50 (diff) | |
| parent | 5802c957972ab972567d7f9a2f35a49bd9fb2cc3 (diff) | |
| download | iced-e31582e59efed3ffc775f2ce12e14dd6c4ec343f.tar.gz iced-e31582e59efed3ffc775f2ce12e14dd6c4ec343f.tar.bz2 iced-e31582e59efed3ffc775f2ce12e14dd6c4ec343f.zip | |
Merge pull request #1797 from bbb651/master
Make mouse::Button::Other take u16 instead of u8
| -rw-r--r-- | core/src/mouse/button.rs | 2 | ||||
| -rw-r--r-- | winit/src/conversion.rs | 4 |
2 files changed, 2 insertions, 4 deletions
diff --git a/core/src/mouse/button.rs b/core/src/mouse/button.rs index aeb8a55d..3eec7f42 100644 --- a/core/src/mouse/button.rs +++ b/core/src/mouse/button.rs @@ -11,5 +11,5 @@ pub enum Button { Middle, /// Some other button. - Other(u8), + Other(u16), } diff --git a/winit/src/conversion.rs b/winit/src/conversion.rs index a9262184..16d9c1c2 100644 --- a/winit/src/conversion.rs +++ b/winit/src/conversion.rs @@ -250,9 +250,7 @@ pub fn mouse_button(mouse_button: winit::event::MouseButton) -> mouse::Button { winit::event::MouseButton::Left => mouse::Button::Left, winit::event::MouseButton::Right => mouse::Button::Right, winit::event::MouseButton::Middle => mouse::Button::Middle, - winit::event::MouseButton::Other(other) => { - mouse::Button::Other(other as u8) - } + winit::event::MouseButton::Other(other) => mouse::Button::Other(other), } } |