diff options
author | 2021-09-15 15:31:40 +0700 | |
---|---|---|
committer | 2021-09-15 15:31:40 +0700 | |
commit | c0ab9888426b7d1f2606afafc9dba06eed7f9419 (patch) | |
tree | 909d04f52e5b2bb51a5784b855a77b45d4a53592 /src | |
parent | 93fec8d273ef8305e1c2456abe0c8ecd7a9d9407 (diff) | |
download | iced-c0ab9888426b7d1f2606afafc9dba06eed7f9419.tar.gz iced-c0ab9888426b7d1f2606afafc9dba06eed7f9419.tar.bz2 iced-c0ab9888426b7d1f2606afafc9dba06eed7f9419.zip |
Revert system menus support
The current implementation has some important issues on Windows. We will reintroduce the feature once we figure them out!
I have kept some of the changes in #945, like the new `keyboard::Modifiers` powered by `bitflags`.
Diffstat (limited to 'src')
-rw-r--r-- | src/application.rs | 15 | ||||
-rw-r--r-- | src/lib.rs | 5 | ||||
-rw-r--r-- | src/sandbox.rs | 2 |
3 files changed, 5 insertions, 17 deletions
diff --git a/src/application.rs b/src/application.rs index 0c30a554..af04215e 100644 --- a/src/application.rs +++ b/src/application.rs @@ -1,5 +1,5 @@ use crate::window; -use crate::{Color, Command, Element, Executor, Menu, Settings, Subscription}; +use crate::{Color, Command, Element, Executor, Settings, Subscription}; /// An interactive cross-platform application. /// @@ -97,7 +97,7 @@ pub trait Application: Sized { type Executor: Executor; /// The type of __messages__ your [`Application`] will produce. - type Message: std::fmt::Debug + Clone + Send; + type Message: std::fmt::Debug + Send; /// The data needed to initialize your [`Application`]. type Flags; @@ -185,13 +185,6 @@ pub trait Application: Sized { false } - /// Returns the current system [`Menu`] of the [`Application`]. - /// - /// By default, it returns an empty [`Menu`]. - fn menu(&self) -> Menu<Self::Message> { - Menu::new() - } - /// Runs the [`Application`]. /// /// On native platforms, this method will take control of the current thread @@ -293,10 +286,6 @@ where fn should_exit(&self) -> bool { self.0.should_exit() } - - fn menu(&self) -> Menu<Self::Message> { - self.0.menu() - } } #[cfg(target_arch = "wasm32")] @@ -246,7 +246,6 @@ pub use sandbox::Sandbox; pub use settings::Settings; pub use runtime::{ - futures, menu, Align, Background, Color, Command, Font, - HorizontalAlignment, Length, Menu, Point, Rectangle, Size, Subscription, - Vector, VerticalAlignment, + futures, Align, Background, Color, Command, Font, HorizontalAlignment, + Length, Point, Rectangle, Size, Subscription, Vector, VerticalAlignment, }; diff --git a/src/sandbox.rs b/src/sandbox.rs index a0bb316e..1b23196f 100644 --- a/src/sandbox.rs +++ b/src/sandbox.rs @@ -87,7 +87,7 @@ use crate::{ /// ``` pub trait Sandbox { /// The type of __messages__ your [`Sandbox`] will produce. - type Message: std::fmt::Debug + Clone + Send; + type Message: std::fmt::Debug + Send; /// Initializes the [`Sandbox`]. /// |