From 9fc5ad23edca93553137100d167de7b69e88f785 Mon Sep 17 00:00:00 2001
From: Richard <richardsoncusto@gmail.com>
Date: Mon, 5 Jul 2021 16:23:44 -0300
Subject: Initial menu implementation

---
 winit/src/application.rs | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'winit/src/application.rs')

diff --git a/winit/src/application.rs b/winit/src/application.rs
index 49f2f513..108c6d64 100644
--- a/winit/src/application.rs
+++ b/winit/src/application.rs
@@ -14,6 +14,7 @@ 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;
@@ -98,6 +99,11 @@ pub trait Application: Program<Clipboard = Clipboard> {
     fn should_exit(&self) -> bool {
         false
     }
+
+    /// TODO
+    fn menu(&self) -> Menu<Self::Message> {
+        Menu::new()
+    }
 }
 
 /// Runs an [`Application`] with an executor, compositor, and the provided
-- 
cgit 


From 31997d255f263a0f47f5af0d8560f3d5bd37f077 Mon Sep 17 00:00:00 2001
From: Héctor Ramón Jiménez <hector0193@gmail.com>
Date: Mon, 12 Jul 2021 22:28:18 +0200
Subject: Store and synchronize `Menu` in `application::State`

---
 winit/src/application.rs | 1 +
 1 file changed, 1 insertion(+)

(limited to 'winit/src/application.rs')

diff --git a/winit/src/application.rs b/winit/src/application.rs
index 108c6d64..bf4b2489 100644
--- a/winit/src/application.rs
+++ b/winit/src/application.rs
@@ -151,6 +151,7 @@ where
             application.mode(),
             event_loop.primary_monitor(),
         )
+        .with_menu(Some(conversion::menu(&application.menu())))
         .build(&event_loop)
         .map_err(Error::WindowCreationFailed)?;
 
-- 
cgit 


From 6221adf2b1b1e8150931d4175e1e36870d45f6e5 Mon Sep 17 00:00:00 2001
From: Héctor Ramón Jiménez <hector0193@gmail.com>
Date: Tue, 13 Jul 2021 20:55:21 +0200
Subject: Draft `conversion::menu_message` in `iced_winit`

... and wire it up to the runtime loop
---
 winit/src/application.rs | 10 ++++++++++
 1 file changed, 10 insertions(+)

(limited to 'winit/src/application.rs')

diff --git a/winit/src/application.rs b/winit/src/application.rs
index bf4b2489..ada64dfc 100644
--- a/winit/src/application.rs
+++ b/winit/src/application.rs
@@ -386,6 +386,16 @@ 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 


From c8ac77e4e99414746adedf38cf69ac8dcd1601a4 Mon Sep 17 00:00:00 2001
From: Héctor Ramón Jiménez <hector0193@gmail.com>
Date: Mon, 19 Jul 2021 21:05:16 +0700
Subject: Write documentation for `menu` method in `Application`

---
 winit/src/application.rs | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'winit/src/application.rs')

diff --git a/winit/src/application.rs b/winit/src/application.rs
index ada64dfc..5d1aabf9 100644
--- a/winit/src/application.rs
+++ b/winit/src/application.rs
@@ -100,7 +100,9 @@ pub trait Application: Program<Clipboard = Clipboard> {
         false
     }
 
-    /// TODO
+    /// Returns the current system [`Menu`] of the [`Application`].
+    ///
+    /// By default, it returns an empty [`Menu`].
     fn menu(&self) -> Menu<Self::Message> {
         Menu::new()
     }
-- 
cgit