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`. --- glutin/src/application.rs | 25 ++++++------------------- 1 file changed, 6 insertions(+), 19 deletions(-) (limited to 'glutin/src/application.rs') diff --git a/glutin/src/application.rs b/glutin/src/application.rs index 936f0cce..fa2192d8 100644 --- a/glutin/src/application.rs +++ b/glutin/src/application.rs @@ -51,15 +51,12 @@ where let subscription = application.subscription(); let context = { - let builder = settings - .window - .into_builder( - &application.title(), - application.mode(), - event_loop.primary_monitor(), - settings.id, - ) - .with_menu(Some(conversion::menu(&application.menu()))); + let builder = settings.window.into_builder( + &application.title(), + application.mode(), + event_loop.primary_monitor(), + settings.id, + ); let context = ContextBuilder::new() .with_vsync(true) @@ -331,16 +328,6 @@ async fn run_instance( // TODO: Handle animations! // Maybe we can use `ControlFlow::WaitUntil` for this. } - 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