feat: menu bar popups

src/widget/segmented_button/widget.rs

@@ -17,7 +17,7 @@ use iced::clipboard::mime::AllowedMimeTypes;
 use iced::touch::Finger;
 use iced::{
     Alignment, Background, Color, Event, Length, Padding, Rectangle, Size, Task, Vector, alignment,
-    event, keyboard, mouse, touch,
+    event, keyboard, mouse, touch, window,
 };
 use iced_core::mouse::ScrollDelta;
 use iced_core::text::{LineHeight, Renderer as TextRenderer, Shaping, Wrapping};
@@ -127,7 +127,7 @@ where
     pub(super) style: Style,
     /// The context menu to display when a context is activated
     #[setters(skip)]
-    pub(super) context_menu: Option<Vec<menu::Tree<'a, Message, crate::Renderer>>>,
+    pub(super) context_menu: Option<Vec<menu::Tree<Message>>>,
     /// Emits the ID of the item that was activated.
     #[setters(skip)]
     pub(super) on_activate: Option<Box<dyn Fn(Entity) -> Message + 'static>>,
@@ -198,13 +198,13 @@ where
         }
     }
 
-    pub fn context_menu(mut self, context_menu: Option<Vec<menu::Tree<'a, Message>>>) -> Self
+    pub fn context_menu(mut self, context_menu: Option<Vec<menu::Tree<Message>>>) -> Self
     where
-        Message: 'static,
+        Message: Clone + 'static,
     {
         self.context_menu = context_menu.map(|menus| {
             vec![menu::Tree::with_children(
-                crate::widget::row::<'static, Message>(),
+                crate::Element::from(crate::widget::row::<'static, Message>()),
                 menus,
             )]
         });
@@ -577,6 +577,7 @@ where
     fn state(&self) -> tree::State {
         #[allow(clippy::default_trait_access)]
         tree::State::new(LocalState {
+            menu_state: Default::default(),
             paragraphs: SecondaryMap::new(),
             text_hashes: SecondaryMap::new(),
             buttons_visible: Default::default(),
@@ -955,8 +956,10 @@ where
 
                                     let menu_state =
                                         tree.children[0].state.downcast_mut::<MenuBarState>();
-                                    menu_state.open = true;
-                                    menu_state.view_cursor = cursor_position;
+                                    menu_state.inner.with_data_mut(|data| {
+                                        data.open = true;
+                                        data.view_cursor = cursor_position;
+                                    });
 
                                     shell.publish(on_context(key));
                                     return event::Status::Captured;
@@ -1346,7 +1349,11 @@ where
             let center_y = bounds.center_y();
 
             let menu_open = !tree.children.is_empty()
-                && tree.children[0].state.downcast_ref::<MenuBarState>().open;
+                && tree.children[0]
+                    .state
+                    .downcast_ref::<MenuBarState>()
+                    .inner
+                    .with_data(|data| data.open);
 
             let key_is_active = self.model.is_active(key);
             let key_is_hovered = self.button_is_hovered(state, key);
@@ -1556,6 +1563,7 @@ where
         translation: Vector,
     ) -> Option<iced_core::overlay::Element<'b, Message, crate::Theme, Renderer>> {
         let state = tree.state.downcast_ref::<LocalState>();
+        let menu_state = state.menu_state.clone();
 
         let Some(entity) = state.show_context else {
             return None;
@@ -1575,7 +1583,12 @@ where
             return None;
         };
 
-        if !tree.children[0].state.downcast_ref::<MenuBarState>().open {
+        if !tree.children[0]
+            .state
+            .downcast_ref::<MenuBarState>()
+            .inner
+            .with_data(|data| data.open)
+        {
             return None;
         }
 
@@ -1584,8 +1597,8 @@ where
 
         Some(
             crate::widget::menu::Menu {
-                tree: &mut tree.children[0],
-                menu_roots: context_menu,
+                tree: menu_state,
+                menu_roots: std::borrow::Cow::Borrowed(context_menu),
                 bounds_expand: 16,
                 menu_overlays_parent: true,
                 close_condition: CloseCondition {
@@ -1600,8 +1613,12 @@ where
                 cross_offset: 0,
                 root_bounds_list: vec![bounds],
                 path_highlight: Some(PathHighlight::MenuActive),
-                style: &crate::theme::menu_bar::MenuBarStyle::Default,
+                style: std::borrow::Cow::Borrowed(&crate::theme::menu_bar::MenuBarStyle::Default),
                 position: Point::new(translation.x, translation.y),
+                is_overlay: true,
+                window_id: window::Id::NONE,
+                depth: 0,
+                on_surface_action: None,
             }
             .overlay(),
         )
@@ -1653,6 +1670,8 @@ where
 
 /// State that is maintained by each individual widget.
 pub struct LocalState {
+    /// Menu state
+    pub(crate) menu_state: MenuBarState,
     /// Defines how many buttons to show at a time.
     pub(super) buttons_visible: usize,
     /// Button visibility offset, when collapsed.