mouse must be over menu to enable cancellable event

haxeui · Apr 6, 2024 · af83004 · af83004
1 parent 9117c16
commit af83004
Showing 1 changed file with 2 additions and 4 deletions.
diff --git a/haxe/ui/containers/menus/MenuBar.hx b/haxe/ui/containers/menus/MenuBar.hx
@@ -232,11 +232,9 @@ private class Events extends haxe.ui.events.Events {
                     return;
                 }
             }
-            if (!force) {
+            if (!force && _currentMenu.hitTest(Screen.instance.currentMouseX, Screen.instance.currentMouseY)) {
                 var beforeCloseEvent = new UIEvent(UIEvent.BEFORE_CLOSE);
-                if (_currentMenu.hitTest(Screen.instance.currentMouseX, Screen.instance.currentMouseY)) {
-                    beforeCloseEvent.relatedComponent = _currentMenu.findComponentsUnderPoint(Screen.instance.currentMouseX, Screen.instance.currentMouseY, MenuItem)[0];
-                }
+                beforeCloseEvent.relatedComponent = _currentMenu.findComponentsUnderPoint(Screen.instance.currentMouseX, Screen.instance.currentMouseY, MenuItem)[0];
                 _menubar.dispatch(beforeCloseEvent);
                 if (beforeCloseEvent.canceled) {
                     return;