menus dont need to hide themselves when associated with a menubar

haxeui · Apr 6, 2024 · b44e521 · b44e521
1 parent af83004
commit b44e521
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 9 deletions.
diff --git a/haxe/ui/containers/menus/Menu.hx b/haxe/ui/containers/menus/Menu.hx
@@ -28,6 +28,8 @@ class Menu extends Box {
     @:behaviour(CurrentIndexBehaviour, 0)    public var currentIndex:Int;
     @:behaviour(CurrentItemBehaviour)        public var currentItem:MenuItem;
 
+    public var menuBar:MenuBar = null;
+
     /**
      Utility property to add a single `MenuEvent.MENU_SELECTED` event
     **/
@@ -171,16 +173,18 @@ class MenuEvents extends haxe.ui.events.Events {
             event.menu = _menu;
             event.menuItem = item;
             findRootMenu().dispatch(event);
-
-            var beforeCloseEvent = new UIEvent(UIEvent.BEFORE_CLOSE);
-            beforeCloseEvent.relatedComponent = item;
-            findRootMenu().dispatch(beforeCloseEvent);
-            if (beforeCloseEvent.canceled) {
-                return;
-            }
 
-            hideMenu();
-            removeScreenMouseDown();
+            if (_menu.menuBar == null) {
+                var beforeCloseEvent = new UIEvent(UIEvent.BEFORE_CLOSE);
+                beforeCloseEvent.relatedComponent = item;
+                findRootMenu().dispatch(beforeCloseEvent);
+                if (beforeCloseEvent.canceled) {
+                    return;
+                }
+
+                hideMenu();
+                removeScreenMouseDown();
+            }
             _menu.dispatch(new UIEvent(UIEvent.CLOSE));
         }
     }

diff --git a/haxe/ui/containers/menus/MenuBar.hx b/haxe/ui/containers/menus/MenuBar.hx
@@ -132,6 +132,7 @@ private class Events extends haxe.ui.events.Events {
             return;
         }
 
+        menu.menuBar = _menubar;
         for (button in builder._buttons) {
             if (button != target) {
                 button.selected = false;