me/iced
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Move menu module from iced_native to iced_core

Browse source
This commit is contained in:
Héctor Ramón Jiménez 2021-07-12 21:44:01 +02:00
parent 1428e9180a
commit 735cfb7908
No known key found for this signature in database
GPG key ID: 44B88EB52AB1EE8D
4 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
core/src/lib.rs
View file

@ -15,6 +15,7 @@
#![forbid(unsafe_code)] #![forbid(unsafe_code)]
#![forbid(rust_2018_idioms)] #![forbid(rust_2018_idioms)]
pub mod keyboard; pub mod keyboard;
pub mod menu;
pub mod mouse; pub mod mouse;
mod align; mod align;
@ -33,6 +34,7 @@ pub use background::Background;
pub use color::Color; pub use color::Color;
pub use font::Font; pub use font::Font;
pub use length::Length; pub use length::Length;
pub use menu::Menu;
pub use padding::Padding; pub use padding::Padding;
pub use point::Point; pub use point::Point;
pub use rectangle::Rectangle; pub use rectangle::Rectangle;

0
native/src/menu.rs → core/src/menu.rs
View file

6
native/src/lib.rs
View file

@ -37,7 +37,6 @@ pub mod clipboard;
pub mod event; pub mod event;
pub mod keyboard; pub mod keyboard;
pub mod layout; pub mod layout;
pub mod menu;
pub mod mouse; pub mod mouse;
pub mod overlay; pub mod overlay;
pub mod program; pub mod program;
@ -62,8 +61,8 @@ mod debug;
mod debug; mod debug;
pub use iced_core::{ pub use iced_core::{
Align, Background, Color, Font, HorizontalAlignment, Length, Padding, menu, Align, Background, Color, Font, HorizontalAlignment, Length, Menu,
Point, Rectangle, Size, Vector, VerticalAlignment, Padding, Point, Rectangle, Size, Vector, VerticalAlignment,
}; };
pub use iced_futures::{executor, futures, Command}; pub use iced_futures::{executor, futures, Command};
@ -76,7 +75,6 @@ pub use element::Element;
pub use event::Event; pub use event::Event;
pub use hasher::Hasher; pub use hasher::Hasher;
pub use layout::Layout; pub use layout::Layout;
pub use menu::Menu;
pub use overlay::Overlay; pub use overlay::Overlay;
pub use program::Program; pub use program::Program;
pub use renderer::Renderer; pub use renderer::Renderer;

4
web/src/lib.rs
View file

@ -74,8 +74,8 @@ pub use dodrio;
pub use element::Element; pub use element::Element;
pub use hasher::Hasher; pub use hasher::Hasher;
pub use iced_core::{ pub use iced_core::{
keyboard, mouse, Align, Background, Color, Font, HorizontalAlignment, keyboard, menu, mouse, Align, Background, Color, Font, HorizontalAlignment,
Length, Padding, Point, Rectangle, Size, Vector, VerticalAlignment, Length, Menu, Padding, Point, Rectangle, Size, Vector, VerticalAlignment,
}; };
pub use iced_futures::{executor, futures, Command}; pub use iced_futures::{executor, futures, Command};
pub use subscription::Subscription; pub use subscription::Subscription;