Merge branch 'main' into ime-support-2

crates/gpui/src/platform/event.rs

@@ -19,20 +19,26 @@ pub struct ModifiersChangedEvent {
     pub cmd: bool,
 }
 
-#[derive(Clone, Debug)]
+#[derive(Clone, Debug, Default)]
 pub struct ScrollWheelEvent {
     pub position: Vector2F,
     pub delta: Vector2F,
     pub precise: bool,
 }
 
-#[derive(Copy, Clone, Debug)]
+#[derive(Hash, PartialEq, Eq, Copy, Clone, Debug)]
 pub enum NavigationDirection {
     Back,
     Forward,
 }
 
-#[derive(Copy, Clone, Debug)]
+impl Default for NavigationDirection {
+    fn default() -> Self {
+        Self::Back
+    }
+}
+
+#[derive(Hash, PartialEq, Eq, Copy, Clone, Debug)]
 pub enum MouseButton {
     Left,
     Right,
@@ -40,8 +46,26 @@ pub enum MouseButton {
     Navigate(NavigationDirection),
 }
 
-#[derive(Clone, Debug)]
-pub struct MouseEvent {
+impl MouseButton {
+    pub fn all() -> Vec<Self> {
+        vec![
+            MouseButton::Left,
+            MouseButton::Right,
+            MouseButton::Middle,
+            MouseButton::Navigate(NavigationDirection::Back),
+            MouseButton::Navigate(NavigationDirection::Forward),
+        ]
+    }
+}
+
+impl Default for MouseButton {
+    fn default() -> Self {
+        Self::Left
+    }
+}
+
+#[derive(Clone, Debug, Default)]
+pub struct MouseButtonEvent {
     pub button: MouseButton,
     pub position: Vector2F,
     pub ctrl: bool,
@@ -51,7 +75,7 @@ pub struct MouseEvent {
     pub click_count: usize,
 }
 
-#[derive(Clone, Copy, Debug)]
+#[derive(Clone, Copy, Debug, Default)]
 pub struct MouseMovedEvent {
     pub position: Vector2F,
     pub pressed_button: Option<MouseButton>,
@@ -66,8 +90,8 @@ pub enum Event {
     KeyDown(KeyDownEvent),
     KeyUp(KeyUpEvent),
     ModifiersChanged(ModifiersChangedEvent),
-    MouseDown(MouseEvent),
-    MouseUp(MouseEvent),
+    MouseDown(MouseButtonEvent),
+    MouseUp(MouseButtonEvent),
     MouseMoved(MouseMovedEvent),
     ScrollWheel(ScrollWheelEvent),
 }