From 7187f08792d90efcb96ba3b3b521a29ec6d999f9 Mon Sep 17 00:00:00 2001 From: Ayush Amawate Date: Mon, 29 Dec 2025 13:06:22 +0530 Subject: [PATCH 1/3] fix: ignore out-of-range mouse button values using from_bits_truncate --- editor/src/messages/input_mapper/utility_types/input_mouse.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/editor/src/messages/input_mapper/utility_types/input_mouse.rs b/editor/src/messages/input_mapper/utility_types/input_mouse.rs index 7d4d197db6..af2d51b666 100644 --- a/editor/src/messages/input_mapper/utility_types/input_mouse.rs +++ b/editor/src/messages/input_mapper/utility_types/input_mouse.rs @@ -76,7 +76,7 @@ pub struct EditorMouseState { impl EditorMouseState { pub fn from_keys_and_editor_position(keys: u8, editor_position: EditorPosition) -> Self { - let mouse_keys = MouseKeys::from_bits(keys).expect("Invalid decoding of MouseKeys"); + let mouse_keys = MouseKeys::from_bits_truncate(keys); Self { editor_position, From 28ad64582ac3edffe59704055dac811117613368 Mon Sep 17 00:00:00 2001 From: Dennis Kobert Date: Sun, 11 Jan 2026 13:54:59 +0100 Subject: [PATCH 2/3] Apply suggestion from @TrueDoctor --- editor/src/messages/input_mapper/utility_types/input_mouse.rs | 1 + 1 file changed, 1 insertion(+) diff --git a/editor/src/messages/input_mapper/utility_types/input_mouse.rs b/editor/src/messages/input_mapper/utility_types/input_mouse.rs index af2d51b666..a42675da9d 100644 --- a/editor/src/messages/input_mapper/utility_types/input_mouse.rs +++ b/editor/src/messages/input_mapper/utility_types/input_mouse.rs @@ -76,6 +76,7 @@ pub struct EditorMouseState { impl EditorMouseState { pub fn from_keys_and_editor_position(keys: u8, editor_position: EditorPosition) -> Self { + // TODO: Some graphic tablets send key codes not mentioned in the spec. In the future we would like to support these as well. let mouse_keys = MouseKeys::from_bits_truncate(keys); Self { From fdde1a870bb4a962e8287d3a156245588f14ba12 Mon Sep 17 00:00:00 2001 From: Dennis Kobert Date: Sun, 11 Jan 2026 23:01:43 +0100 Subject: [PATCH 3/3] Fix formatting --- editor/src/messages/input_mapper/utility_types/input_mouse.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/editor/src/messages/input_mapper/utility_types/input_mouse.rs b/editor/src/messages/input_mapper/utility_types/input_mouse.rs index a42675da9d..6fba502779 100644 --- a/editor/src/messages/input_mapper/utility_types/input_mouse.rs +++ b/editor/src/messages/input_mapper/utility_types/input_mouse.rs @@ -76,7 +76,7 @@ pub struct EditorMouseState { impl EditorMouseState { pub fn from_keys_and_editor_position(keys: u8, editor_position: EditorPosition) -> Self { - // TODO: Some graphic tablets send key codes not mentioned in the spec. In the future we would like to support these as well. + // TODO: Some graphic tablets send key codes not mentioned in the spec. In the future we would like to support these as well. let mouse_keys = MouseKeys::from_bits_truncate(keys); Self {