Merge pull request #2123 from luca020400/luca/context_menu_overflow

Author: andymandias

CHANGELOG.md

@@ -23,6 +23,7 @@ Fixed:
 - Prevent anti-flood rate limiting from refilling the token bucket beyond its configured capacity
 - Show unread indicators for panes hidden by maximize
 - Allow commands (e.g. `/join`) to be used in the input box of not-joined channels
+- Disabled menu entries now block clicks from passing through
 
 Changed:
 

src/widget/context_menu.rs

@@ -359,9 +359,12 @@ where
     ) -> mouse::Interaction {
         if cursor.is_over(layout.bounds()) {
             self.mouse_interaction_on_hover.unwrap_or({
-                let base_state = tree.children.first().unwrap();
                 self.base.as_widget().mouse_interaction(
-                    base_state, layout, cursor, viewport, renderer,
+                    &tree.children[0],
+                    layout,
+                    cursor,
+                    viewport,
+                    renderer,
                 )
             })
         } else {
@@ -377,9 +380,8 @@ where
         viewport: &Rectangle,
         translation: Vector,
     ) -> Option<overlay::Element<'b, Message, Theme, Renderer>> {
-        let base_state = tree.children.first_mut().unwrap();
         let base = self.base.as_widget_mut().overlay(
-            base_state,
+            &mut tree.children[0],
             layout,
             renderer,
             viewport,
@@ -668,13 +670,21 @@ where
         cursor: mouse::Cursor,
         renderer: &Renderer,
     ) -> iced::advanced::mouse::Interaction {
-        self.menu.as_widget().mouse_interaction(
+        let interaction = self.menu.as_widget().mouse_interaction(
             &self.state.menu_tree,
             layout,
             cursor,
             &layout.bounds(),
             renderer,
-        )
+        );
+
+        if interaction == mouse::Interaction::None
+            && cursor.is_over(layout.bounds())
+        {
+            mouse::Interaction::Idle
+        } else {
+            interaction
+        }
     }
 }