diff options
| author |  Héctor Ramón Jiménez <hector0193@gmail.com> | 2020-04-29 03:21:46 +0200 |
|---|---|---|
| committer | Héctor Ramón Jiménez <hector0193@gmail.com> | 2020-04-29 03:23:02 +0200 |
| commit | ec712c8032a25c5dc65152c3ab39bddaecbdce77 (patch) | |
| tree | d84fa3a12f506eec26c2ffb71f508432bac473a4 | |
| parent | 52719c7076cafb7b01967edf4df11ea72ae45aff (diff) | |
| download | iced-ec712c8032a25c5dc65152c3ab39bddaecbdce77.tar.gz iced-ec712c8032a25c5dc65152c3ab39bddaecbdce77.tar.bz2 iced-ec712c8032a25c5dc65152c3ab39bddaecbdce77.zip | |
Move `MouseCursor` to `iced_core`
| -rw-r--r-- | core/src/lib.rs | 2 | ||||
| -rw-r--r-- | core/src/mouse_cursor.rs (renamed from native/src/mouse_cursor.rs) | 0 | ||||
| -rw-r--r-- | native/src/lib.rs | 6 | ||||
| -rw-r--r-- | src/lib.rs | 3 | ||||
| -rw-r--r-- | web/src/lib.rs | 2 |
5 files changed, 7 insertions, 6 deletions
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/native/src/mouse_cursor.rs b/core/src/mouse_cursor.rs index 78ddb0ae..78ddb0ae 100644 --- a/native/src/mouse_cursor.rs +++ b/core/src/mouse_cursor.rs 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; @@ -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; |