3 files changed, 27 insertions, 0 deletions

diff --git a/src/ui/util.c b/src/ui/util.c
index 222d5716..7fc27130 100644
--- a/src/ui/util.c
+++ b/src/ui/util.c
@@ -380,9 +380,21 @@ static iBool isCommandIgnoredByMenus_(const char *cmd) {
            equal_Command(cmd, "bookmarks.request.finished") ||
            equal_Command(cmd, "window.resized") ||
            equal_Command(cmd, "window.reload.update") ||
+           equal_Command(cmd, "window.mouse.exited") ||
+           equal_Command(cmd, "window.mouse.entered") ||
            (equal_Command(cmd, "mouse.clicked") && !arg_Command(cmd)); /* button released */
 }
 
+static iLabelWidget *parentMenuButton_(const iWidget *menu) {
+    if (isInstance_Object(menu->parent, &Class_LabelWidget)) {
+        iLabelWidget *button = (iLabelWidget *) menu->parent;
+        if (!cmp_String(command_LabelWidget(button), "menu.open")) {
+            return button;
+        }
+    }
+    return NULL;
+}
+
 static iBool menuHandler_(iWidget *menu, const char *cmd) {
     if (isVisible_Widget(menu)) {
         if (equalWidget_Command(cmd, menu, "menu.opened")) {
@@ -394,6 +406,9 @@ static iBool menuHandler_(iWidget *menu, const char *cmd) {
         }
         if ((equal_Command(cmd, "mouse.clicked") || equal_Command(cmd, "mouse.missed")) &&
             arg_Command(cmd)) {
+            if (hitChild_Widget(get_Window()->root, coord_Command(cmd)) == parentMenuButton_(menu)) {
+                return iFalse;
+            }
             /* Dismiss open menus when clicking outside them. */
             closeMenu_Widget(menu);
             return iTrue;
diff --git a/src/ui/widget.c b/src/ui/widget.c
index f3e73ee7..1d2aecf0 100644
--- a/src/ui/widget.c
+++ b/src/ui/widget.c
@@ -728,6 +728,17 @@ size_t childIndex_Widget(const iWidget *d, const iAnyObject *child) {
     return iInvalidPos;
 }
 
+iAny *hitChild_Widget(const iWidget *d, iInt2 coord) {
+    iConstForEach(ObjectList, i, d->children) {
+        iAny *found = hitChild_Widget(constAs_Widget(i.object), coord);
+        if (found) return found;
+    }
+    if (contains_Widget(d, coord)) {
+        return iConstCast(iWidget *, d);
+    }
+    return NULL;
+}
+
 iAny *findChild_Widget(const iWidget *d, const char *id) {
     if (cmp_String(id_Widget(d), id) == 0) {
         return iConstCast(iAny *, d);
diff --git a/src/ui/widget.h b/src/ui/widget.h
index f06a6607..e40b333b 100644
--- a/src/ui/widget.h
+++ b/src/ui/widget.h
@@ -146,6 +146,7 @@ iRect   bounds_Widget       (const iWidget *); /* outer bounds */
 iRect   innerBounds_Widget  (const iWidget *);
 iInt2   localCoord_Widget   (const iWidget *, iInt2 coord);
 iBool   contains_Widget     (const iWidget *, iInt2 coord);
+iAny *  hitChild_Widget     (const iWidget *, iInt2 coord);
 iAny *  findChild_Widget    (const iWidget *, const char *id);
 iAny *  findParentClass_Widget(const iWidget *, const iAnyClass *class);
 iAny *  findFocusable_Widget(const iWidget *startFrom, enum iWidgetFocusDir focusDir);