From c0ab9888426b7d1f2606afafc9dba06eed7f9419 Mon Sep 17 00:00:00 2001
From: Héctor Ramón Jiménez <hector0193@gmail.com>
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/Cargo.toml         |  2 +-
 glutin/src/application.rs | 25 ++++++-------------------
 2 files changed, 7 insertions(+), 20 deletions(-)

(limited to 'glutin')

diff --git a/glutin/Cargo.toml b/glutin/Cargo.toml
index 4300d77c..78d5fe47 100644
--- a/glutin/Cargo.toml
+++ b/glutin/Cargo.toml
@@ -16,7 +16,7 @@ debug = ["iced_winit/debug"]
 [dependencies.glutin]
 version = "0.27"
 git = "https://github.com/iced-rs/glutin"
-rev = "849352f1cb7021b7514a3104daf3e6236c915dac"
+rev = "2564d0ab87cf2ad824a2a58733aebe40dd2f29bb"
 
 [dependencies.iced_native]
 version = "0.4"
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<A, E, C>(
                 // 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