From ec712c8032a25c5dc65152c3ab39bddaecbdce77 Mon Sep 17 00:00:00 2001
From: Héctor Ramón Jiménez <hector0193@gmail.com>
Date: Wed, 29 Apr 2020 03:21:46 +0200
Subject: Move `MouseCursor` to `iced_core`

---
 core/src/lib.rs            |  2 ++
 core/src/mouse_cursor.rs   | 36 ++++++++++++++++++++++++++++++++++++
 native/src/lib.rs          |  6 ++----
 native/src/mouse_cursor.rs | 36 ------------------------------------
 src/lib.rs                 |  3 ++-
 web/src/lib.rs             |  2 +-
 6 files changed, 43 insertions(+), 42 deletions(-)
 create mode 100644 core/src/mouse_cursor.rs
 delete mode 100644 native/src/mouse_cursor.rs

diff --git a/core/src/lib.rs b/core/src/lib.rs
index 606c1b8b..f0072f61 100644
--- a/core/src/lib.rs
+++ b/core/src/lib.rs
@@ -23,6 +23,7 @@ mod button_state;
 mod color;
 mod font;
 mod length;
+mod mouse_cursor;
 mod point;
 mod rectangle;
 mod size;
@@ -34,6 +35,7 @@ pub use button_state::ButtonState;
 pub use color::Color;
 pub use font::Font;
 pub use length::Length;
+pub use mouse_cursor::MouseCursor;
 pub use point::Point;
 pub use rectangle::Rectangle;
 pub use size::Size;
diff --git a/core/src/mouse_cursor.rs b/core/src/mouse_cursor.rs
new file mode 100644
index 00000000..78ddb0ae
--- /dev/null
+++ b/core/src/mouse_cursor.rs
@@ -0,0 +1,36 @@
+/// The state of the mouse cursor.
+#[derive(Debug, Eq, PartialEq, Clone, Copy, PartialOrd, Ord)]
+pub enum MouseCursor {
+    /// The cursor is over a non-interactive widget.
+    Idle,
+
+    /// The cursor is over a clickable widget.
+    Pointer,
+
+    /// The cursor is over a busy widget.
+    Working,
+
+    /// The cursor is over a grabbable widget.
+    Grab,
+
+    /// The cursor is over a text widget.
+    Text,
+
+    /// The cursor is over a widget that requires precision.
+    Crosshair,
+
+    /// The cursor is grabbing a widget.
+    Grabbing,
+
+    /// The cursor is resizing a widget horizontally.
+    ResizingHorizontally,
+
+    /// The cursor is resizing a widget vertically.
+    ResizingVertically,
+}
+
+impl Default for MouseCursor {
+    fn default() -> MouseCursor {
+        MouseCursor::Idle
+    }
+}
diff --git a/native/src/lib.rs b/native/src/lib.rs
index 89612391..a3b581b3 100644
--- a/native/src/lib.rs
+++ b/native/src/lib.rs
@@ -50,13 +50,12 @@ mod clipboard;
 mod element;
 mod event;
 mod hasher;
-mod mouse_cursor;
 mod runtime;
 mod user_interface;
 
 pub use iced_core::{
-    Align, Background, Color, Font, HorizontalAlignment, Length, Point,
-    Rectangle, Size, Vector, VerticalAlignment,
+    Align, Background, Color, Font, HorizontalAlignment, Length, MouseCursor,
+    Point, Rectangle, Size, Vector, VerticalAlignment,
 };
 pub use iced_futures::{executor, futures, Command};
 
@@ -68,7 +67,6 @@ pub use element::Element;
 pub use event::Event;
 pub use hasher::Hasher;
 pub use layout::Layout;
-pub use mouse_cursor::MouseCursor;
 pub use renderer::Renderer;
 pub use runtime::Runtime;
 pub use subscription::Subscription;
diff --git a/native/src/mouse_cursor.rs b/native/src/mouse_cursor.rs
deleted file mode 100644
index 78ddb0ae..00000000
--- a/native/src/mouse_cursor.rs
+++ /dev/null
@@ -1,36 +0,0 @@
-/// The state of the mouse cursor.
-#[derive(Debug, Eq, PartialEq, Clone, Copy, PartialOrd, Ord)]
-pub enum MouseCursor {
-    /// The cursor is over a non-interactive widget.
-    Idle,
-
-    /// The cursor is over a clickable widget.
-    Pointer,
-
-    /// The cursor is over a busy widget.
-    Working,
-
-    /// The cursor is over a grabbable widget.
-    Grab,
-
-    /// The cursor is over a text widget.
-    Text,
-
-    /// The cursor is over a widget that requires precision.
-    Crosshair,
-
-    /// The cursor is grabbing a widget.
-    Grabbing,
-
-    /// The cursor is resizing a widget horizontally.
-    ResizingHorizontally,
-
-    /// The cursor is resizing a widget vertically.
-    ResizingVertically,
-}
-
-impl Default for MouseCursor {
-    fn default() -> MouseCursor {
-        MouseCursor::Idle
-    }
-}
diff --git a/src/lib.rs b/src/lib.rs
index eee7a6ee..c574a345 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -207,7 +207,8 @@ use iced_web as runtime;
 
 pub use runtime::{
     futures, Align, Background, Color, Command, Font, HorizontalAlignment,
-    Length, Point, Rectangle, Size, Subscription, Vector, VerticalAlignment,
+    Length, MouseCursor, Point, Rectangle, Size, Subscription, Vector,
+    VerticalAlignment,
 };
 
 #[cfg(not(target_arch = "wasm32"))]
diff --git a/web/src/lib.rs b/web/src/lib.rs
index cccecdc3..c525021f 100644
--- a/web/src/lib.rs
+++ b/web/src/lib.rs
@@ -75,7 +75,7 @@ pub use element::Element;
 pub use hasher::Hasher;
 pub use iced_core::{
     keyboard, Align, Background, Color, Font, HorizontalAlignment, Length,
-    Point, Rectangle, Size, Vector, VerticalAlignment,
+    MouseCursor, Point, Rectangle, Size, Vector, VerticalAlignment,
 };
 pub use iced_futures::{executor, futures, Command};
 pub use subscription::Subscription;
-- 
cgit