From 5802c957972ab972567d7f9a2f35a49bd9fb2cc3 Mon Sep 17 00:00:00 2001 From: bbb651 Date: Sat, 15 Apr 2023 00:45:30 +0300 Subject: Make mouse::Button::Other take u16 instead of u8 On wayland keys correspond to , 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). --- core/src/mouse/button.rs | 2 +- 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 e416c073..22d8f223 100644 --- 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), } } -- cgit