From 56dbd683269b82da16d8eae3f98f352301750bf5 Mon Sep 17 00:00:00 2001
From: Héctor Ramón Jiménez <hector0193@gmail.com>
Date: Tue, 28 Apr 2020 03:11:01 +0200
Subject: Move reusable `mouse` types to `iced_core`

---
 core/src/mouse/button.rs | 15 ++++++++++++
 core/src/mouse/event.rs  | 61 ++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 76 insertions(+)
 create mode 100644 core/src/mouse/button.rs
 create mode 100644 core/src/mouse/event.rs

(limited to 'core/src/mouse')

diff --git a/core/src/mouse/button.rs b/core/src/mouse/button.rs
new file mode 100644
index 00000000..aeb8a55d
--- /dev/null
+++ b/core/src/mouse/button.rs
@@ -0,0 +1,15 @@
+/// The button of a mouse.
+#[derive(Debug, Hash, PartialEq, Eq, Clone, Copy)]
+pub enum Button {
+    /// The left mouse button.
+    Left,
+
+    /// The right mouse button.
+    Right,
+
+    /// The middle (wheel) button.
+    Middle,
+
+    /// Some other button.
+    Other(u8),
+}
diff --git a/core/src/mouse/event.rs b/core/src/mouse/event.rs
new file mode 100644
index 00000000..52e9d851
--- /dev/null
+++ b/core/src/mouse/event.rs
@@ -0,0 +1,61 @@
+use super::Button;
+use crate::ButtonState;
+
+/// A mouse event.
+///
+/// _**Note:** This type is largely incomplete! If you need to track
+/// additional events, feel free to [open an issue] and share your use case!_
+///
+/// [open an issue]: https://github.com/hecrj/iced/issues
+#[derive(Debug, Clone, Copy, PartialEq)]
+pub enum Event {
+    /// The mouse cursor entered the window.
+    CursorEntered,
+
+    /// The mouse cursor left the window.
+    CursorLeft,
+
+    /// The mouse cursor was moved
+    CursorMoved {
+        /// The X coordinate of the mouse position
+        x: f32,
+
+        /// The Y coordinate of the mouse position
+        y: f32,
+    },
+
+    /// A mouse button was pressed or released.
+    Input {
+        /// The button identifier
+        button: Button,
+
+        /// The state of the button
+        state: ButtonState,
+    },
+
+    /// The mouse wheel was scrolled.
+    WheelScrolled {
+        /// The scroll movement.
+        delta: ScrollDelta,
+    },
+}
+
+/// A scroll movement.
+#[derive(Debug, Clone, Copy, PartialEq)]
+pub enum ScrollDelta {
+    /// A line-based scroll movement
+    Lines {
+        /// The number of horizontal lines scrolled
+        x: f32,
+
+        /// The number of vertical lines scrolled
+        y: f32,
+    },
+    /// A pixel-based scroll movement
+    Pixels {
+        /// The number of horizontal pixels scrolled
+        x: f32,
+        /// The number of vertical pixels scrolled
+        y: f32,
+    },
+}
-- 
cgit 


From e55cd9652e7c7aea4dc2c6ccb83769246d1a808e Mon Sep 17 00:00:00 2001
From: Héctor Ramón Jiménez <hector0193@gmail.com>
Date: Thu, 30 Apr 2020 04:53:15 +0200
Subject: Split `Input` mouse event by `ButtonState`

---
 core/src/mouse/event.rs | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

(limited to 'core/src/mouse')

diff --git a/core/src/mouse/event.rs b/core/src/mouse/event.rs
index 52e9d851..2f07b207 100644
--- a/core/src/mouse/event.rs
+++ b/core/src/mouse/event.rs
@@ -1,5 +1,4 @@
 use super::Button;
-use crate::ButtonState;
 
 /// A mouse event.
 ///
@@ -24,14 +23,11 @@ pub enum Event {
         y: f32,
     },
 
-    /// A mouse button was pressed or released.
-    Input {
-        /// The button identifier
-        button: Button,
+    /// A mouse button was pressed.
+    ButtonPressed(Button),
 
-        /// The state of the button
-        state: ButtonState,
-    },
+    /// A mouse button was released.
+    ButtonReleased(Button),
 
     /// The mouse wheel was scrolled.
     WheelScrolled {
-- 
cgit 


From 98bc8cf2a7c4944d762a0148ca9f615d6ccc0d6e Mon Sep 17 00:00:00 2001
From: Héctor Ramón Jiménez <hector0193@gmail.com>
Date: Thu, 30 Apr 2020 08:16:38 +0200
Subject: Rename `MouseCursor` to `mouse::Interaction`

---
 core/src/mouse/interaction.rs | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)
 create mode 100644 core/src/mouse/interaction.rs

(limited to 'core/src/mouse')

diff --git a/core/src/mouse/interaction.rs b/core/src/mouse/interaction.rs
new file mode 100644
index 00000000..664147a7
--- /dev/null
+++ b/core/src/mouse/interaction.rs
@@ -0,0 +1,20 @@
+/// The interaction of a mouse cursor.
+#[derive(Debug, Eq, PartialEq, Clone, Copy, PartialOrd, Ord)]
+#[allow(missing_docs)]
+pub enum Interaction {
+    Idle,
+    Pointer,
+    Grab,
+    Text,
+    Crosshair,
+    Working,
+    Grabbing,
+    ResizingHorizontally,
+    ResizingVertically,
+}
+
+impl Default for Interaction {
+    fn default() -> Interaction {
+        Interaction::Idle
+    }
+}
-- 
cgit