Make mouse::Button::Other take u16 instead of u8

On wayland keys correspond to <input-event-codes.h>, and they are past the limit of u8, causing the back and forward buttons to be 20 and 19 which definitely isn't right (they should all be around 0x110..=0x117).
iced-rs · May 23, 2023 · 5802c95 · 5802c95
1 parent 4b05f42
commit 5802c95
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 4 deletions.
diff --git 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
@@ -249,9 +249,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),
     }
 }