Changeset 21961

Timestamp:

08/14/07 22:12:05 (16 months ago)

Author:

axeld

Message:

The bug worked around in r21960 also affected Haiku. Now, a menu is only quit if the click
into its "controlling" window targeted the preferred handler - ie. is a standard click that
is not sent because of an event mask.

Files:

• haiku/trunk/src/kits/interface/Window.cpp (modified) (1 diff)

haiku/trunk/src/kits/interface/Window.cpp

@@ -1009 +1009 @@
                         BView *view = dynamic_cast<BView *>(target);
                         
-                        // Close an eventually opened menu, unless the target is the menu itself
+                        // Close an eventually opened menu, if this click targets the
+                        // preferred handler, and unless the target is the menu itself
                         BMenu *menu = dynamic_cast<BMenu *>(fFocus);
-                        if (menu != NULL && menu != view && menu->State() != MENU_STATE_CLOSED) {
+                        if (menu != NULL && menu != view && PreferredHandler() == target
+                                && menu->State() != MENU_STATE_CLOSED) {
                                 menu->QuitTracking();
                                 return;