From c0ab9888426b7d1f2606afafc9dba06eed7f9419 Mon Sep 17 00:00:00 2001 From: Héctor Ramón Jiménez Date: Wed, 15 Sep 2021 15:31:40 +0700 Subject: 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`. --- winit/src/application.rs | 19 ------------------- 1 file changed, 19 deletions(-) (limited to 'winit/src/application.rs') diff --git a/winit/src/application.rs b/winit/src/application.rs index 722b4757..ab9a70a0 100644 --- a/winit/src/application.rs +++ b/winit/src/application.rs @@ -15,7 +15,6 @@ use iced_futures::futures; use iced_futures::futures::channel::mpsc; use iced_graphics::window; use iced_native::program::Program; -use iced_native::Menu; use iced_native::{Cache, UserInterface}; use std::mem::ManuallyDrop; @@ -100,13 +99,6 @@ pub trait Application: Program { fn should_exit(&self) -> bool { false } - - /// Returns the current system [`Menu`] of the [`Application`]. - /// - /// By default, it returns an empty [`Menu`]. - fn menu(&self) -> Menu { - Menu::new() - } } /// Runs an [`Application`] with an executor, compositor, and the provided @@ -153,7 +145,6 @@ where event_loop.primary_monitor(), settings.id, ) - .with_menu(Some(conversion::menu(&application.menu()))) .build(&event_loop) .map_err(Error::WindowCreationFailed)?; @@ -419,16 +410,6 @@ async fn run_instance( }, } } - event::Event::WindowEvent { - event: event::WindowEvent::MenuEntryActivated(entry_id), - .. - } => { - if let Some(message) = - conversion::menu_message(state.menu(), entry_id) - { - messages.push(message); - } - } event::Event::WindowEvent { event: window_event, .. -- cgit