diff options
| author |  Héctor Ramón Jiménez <hector0193@gmail.com> | 2021-07-12 21:44:01 +0200 |
|---|---|---|
| committer | Héctor Ramón Jiménez <hector0193@gmail.com> | 2021-07-12 21:44:01 +0200 |
| commit | 735cfb790813c44852612400e31c0190b9c641a6 (patch) | |
| tree | 4b33019dc01fd8afbe3d79431660788961262dcd | |
| parent | 1428e9180ae9f4edbf22514bb74c5c7e9df9c712 (diff) | |
| download | iced-735cfb790813c44852612400e31c0190b9c641a6.tar.gz iced-735cfb790813c44852612400e31c0190b9c641a6.tar.bz2 iced-735cfb790813c44852612400e31c0190b9c641a6.zip | |
Move `menu` module from `iced_native` to `iced_core`
| -rw-r--r-- | core/src/lib.rs | 2 | ||||
| -rw-r--r-- | core/src/menu.rs (renamed from native/src/menu.rs) | 0 | ||||
| -rw-r--r-- | native/src/lib.rs | 6 | ||||
| -rw-r--r-- | web/src/lib.rs | 4 |
4 files changed, 6 insertions, 6 deletions
diff --git a/core/src/lib.rs b/core/src/lib.rs index 6453d599..c4288158 100644 --- a/core/src/lib.rs +++ b/core/src/lib.rs @@ -15,6 +15,7 @@ #![forbid(unsafe_code)] #![forbid(rust_2018_idioms)] pub mod keyboard; +pub mod menu; pub mod mouse; mod align; @@ -33,6 +34,7 @@ pub use background::Background; pub use color::Color; pub use font::Font; pub use length::Length; +pub use menu::Menu; pub use padding::Padding; pub use point::Point; pub use rectangle::Rectangle; diff --git a/native/src/menu.rs b/core/src/menu.rs index fe770216..fe770216 100644 --- a/native/src/menu.rs +++ b/core/src/menu.rs diff --git a/native/src/lib.rs b/native/src/lib.rs index 564f2514..cbb02506 100644 --- a/native/src/lib.rs +++ b/native/src/lib.rs @@ -37,7 +37,6 @@ pub mod clipboard; pub mod event; pub mod keyboard; pub mod layout; -pub mod menu; pub mod mouse; pub mod overlay; pub mod program; @@ -62,8 +61,8 @@ mod debug; mod debug; pub use iced_core::{ - Align, Background, Color, Font, HorizontalAlignment, Length, Padding, - Point, Rectangle, Size, Vector, VerticalAlignment, + menu, Align, Background, Color, Font, HorizontalAlignment, Length, Menu, + Padding, Point, Rectangle, Size, Vector, VerticalAlignment, }; pub use iced_futures::{executor, futures, Command}; @@ -76,7 +75,6 @@ pub use element::Element; pub use event::Event; pub use hasher::Hasher; pub use layout::Layout; -pub use menu::Menu; pub use overlay::Overlay; pub use program::Program; pub use renderer::Renderer; diff --git a/web/src/lib.rs b/web/src/lib.rs index 158416b9..6b7d0115 100644 --- a/web/src/lib.rs +++ b/web/src/lib.rs @@ -74,8 +74,8 @@ pub use dodrio; pub use element::Element; pub use hasher::Hasher; pub use iced_core::{ - keyboard, mouse, Align, Background, Color, Font, HorizontalAlignment, - Length, Padding, Point, Rectangle, Size, Vector, VerticalAlignment, + keyboard, menu, mouse, Align, Background, Color, Font, HorizontalAlignment, + Length, Menu, Padding, Point, Rectangle, Size, Vector, VerticalAlignment, }; pub use iced_futures::{executor, futures, Command}; pub use subscription::Subscription; |