better mouse navigation

griffi-gh · Oct 2, 2023 · 13f800e · 13f800e
1 parent 2c5c5f1
commit 13f800e
Showing 1 changed file with 12 additions and 4 deletions.
diff --git a/yarge-frontend-sdl/src/menu.rs b/yarge-frontend-sdl/src/menu.rs
@@ -180,12 +180,20 @@ impl Menu {
       Event::KeyDown { keycode: Some(Keycode::Up), .. } if self.active => {
         self.cursor -= 1;
       },
-      Event::MouseButtonUp { mouse_btn: MouseButton::Left, .. } |
-      Event::KeyDown { keycode: Some(Keycode::Return | Keycode::Return2), repeat: false, .. } if self.active => {
-        self.clicked = true;
+      Event::MouseWheel { y, .. } => {
+        //self.scroll -= *y * MENU_ITEM_HEIGHT as i32 / 2;
+        self.cursor -= *y as isize;
+      },
+      Event::MouseMotion { y, .. } |
+      Event::MouseButtonDown { mouse_btn: MouseButton::Left, y, ..  } if self.active => {
+        self.mouse_navigation = Some(*y);
       },
-      Event::MouseMotion { y, .. } => {
+      Event::MouseButtonUp { mouse_btn: MouseButton::Left, y, .. } if self.active => {
         self.mouse_navigation = Some(*y);
+        self.clicked = true;
+      }
+      Event::KeyDown { keycode: Some(Keycode::Return | Keycode::Return2), repeat: false, .. } if self.active => {
+        self.clicked = true;
       },
       _ => ()
     }