fix(menu): panic when right-clicking a submenu

examples/context-menu/src/main.rs

@@ -30,6 +30,7 @@ pub enum Message {
     WindowClose,
     Surface(cosmic::surface::Action),
     ToggleHideContent,
+    ToggleSomeAction,
     WindowNew,
 }
 
@@ -82,6 +83,7 @@ impl cosmic::Application for App {
 
     /// Handle application events here.
     fn update(&mut self, message: Self::Message) -> Task<Self::Message> {
+        tracing::error!("Clicked {message:?}");
         match message {
             Message::Clicked => {
                 self.button_label = format!("Clicked {message:?}");
@@ -91,8 +93,9 @@ impl cosmic::Application for App {
                     cosmic::app::Action::Surface(action),
                 ));
             }
-            Message::WindowClose => {}
-            Message::ToggleHideContent => {}
+            Message::WindowClose | 
+            Message::ToggleHideContent | 
+            Message::ToggleSomeAction | 
             Message::WindowNew=> {}
         }
 
@@ -102,7 +105,7 @@ impl cosmic::Application for App {
     /// Creates a view after each update.
     fn view(&self) -> Element<'_, Self::Message> {
         let widget = cosmic::widget::context_menu(
-            cosmic::widget::button::text(self.button_label.to_string()).on_press(Message::Clicked),
+            cosmic::widget::button::text(self.button_label.clone()).on_press(Message::Clicked),
             self.context_menu(),
         )
         .on_surface_action(Message::Surface);
@@ -131,7 +134,14 @@ impl App {
                         None,
                         self.hide_content,
                         ContextMenuAction::ToggleHideContent,
-                    )],
+                    ),
+                    menu::Item::CheckBox(
+                        "Test content",
+                        None,
+                        self.hide_content,
+                        ContextMenuAction::ToggleSomeAction,
+                    )
+                    ],
                 ),
                 menu::Item::Divider,
                 menu::Item::Button("Quit", None, ContextMenuAction::WindowClose),
@@ -144,6 +154,7 @@ impl App {
 pub enum ContextMenuAction {
     WindowClose,
     ToggleHideContent,
+    ToggleSomeAction,
     WindowNew,
 }
 
@@ -153,6 +164,7 @@ impl menu::Action for ContextMenuAction {
         match self {
             ContextMenuAction::WindowClose => Message::WindowClose,
             ContextMenuAction::ToggleHideContent => Message::ToggleHideContent,
+            ContextMenuAction::ToggleSomeAction => Message::ToggleSomeAction,
             ContextMenuAction::WindowNew => Message::WindowNew,
         }
     }

src/widget/menu/menu_inner.rs

@@ -650,7 +650,7 @@ impl<'b, Message: Clone + 'static> Menu<'b, Message> {
                     state.pressed = false;
 
                     // process close condition
-                    if state
+                    if state.open && state
                         .view_cursor
                         .position()
                         .unwrap_or_default()
@@ -1428,7 +1428,7 @@ where
         state.view_cursor = view_cursor;
 
         // * remove invalid menus
-
+        if state.open {
             let mut prev_bounds = std::iter::once(menu.bar_bounds)
                 .chain(
                     if menu.is_overlay {
@@ -1471,6 +1471,7 @@ where
                     state.menu_states.pop();
                 }
             }
+        }
 
         // * update active item
         let menu_states_len = state.menu_states.len();