Ensure that the mouse position is positive

fredizzimo · Jul 9, 2024 · 5640ad6 · 5640ad6
1 parent af5924e
commit 5640ad6
Showing 1 changed file with 8 additions and 7 deletions.
diff --git a/src/window/mouse_manager.rs b/src/window/mouse_manager.rs
@@ -63,7 +63,7 @@ struct TouchTrace {
 
 pub struct MouseManager {
     drag_details: Option<DragDetails>,
-    grid_position: GridPos<i32>,
+    grid_position: GridPos<u32>,
 
     has_moved: bool,
     window_position: PixelPos<f32>,
@@ -110,7 +110,7 @@ impl MouseManager {
         &self,
         window_details: &WindowDrawDetails,
         editor_state: &EditorState,
-    ) -> GridPos<i32> {
+    ) -> GridPos<u32> {
         let global_bounds = window_details.region;
         let clamped_position = clamp_position(
             self.window_position,
@@ -121,6 +121,7 @@ impl MouseManager {
 
         (relative_position / *editor_state.grid_scale)
             .floor()
+            .max((0.0, 0.0).into())
             .cast()
     }
 
@@ -157,7 +158,7 @@ impl MouseManager {
                     send_ui(SerialCommand::Drag {
                         button: mouse_button_to_button_text(drag_details.button).unwrap(),
                         grid_id: window_details.event_grid_id(),
-                        position: self.grid_position.try_cast().unwrap().to_tuple(),
+                        position: self.grid_position.to_tuple(),
                         modifier_string: editor_state
                             .keyboard_manager
                             .format_modifier_string("", true),
@@ -168,7 +169,7 @@ impl MouseManager {
                         button: "move".into(),
                         action: "".into(), // this is ignored by nvim
                         grid_id: window_details.event_grid_id(),
-                        position: relative_position.try_cast().unwrap().to_tuple(),
+                        position: relative_position.to_tuple(),
                         modifier_string: editor_state
                             .keyboard_manager
                             .format_modifier_string("", true),
@@ -208,7 +209,7 @@ impl MouseManager {
                         button: button_text.clone(),
                         action,
                         grid_id: details.event_grid_id(),
-                        position: position.try_cast().unwrap().to_tuple(),
+                        position: position.to_tuple(),
                         modifier_string: editor_state
                             .keyboard_manager
                             .format_modifier_string("", true),
@@ -255,7 +256,7 @@ impl MouseManager {
             let scroll_command = SerialCommand::Scroll {
                 direction: input_type.to_string(),
                 grid_id,
-                position: self.grid_position.try_cast().unwrap().to_tuple(),
+                position: self.grid_position.to_tuple(),
                 modifier_string: editor_state
                     .keyboard_manager
                     .format_modifier_string("", true),
@@ -275,7 +276,7 @@ impl MouseManager {
             let scroll_command = SerialCommand::Scroll {
                 direction: input_type.to_string(),
                 grid_id,
-                position: self.grid_position.try_cast().unwrap().to_tuple(),
+                position: self.grid_position.to_tuple(),
                 modifier_string: editor_state
                     .keyboard_manager
                     .format_modifier_string("", true),