[haiku-commits] haiku: hrev45486 - src/kits/interface

  • From: stefano.ceccherini@xxxxxxxxx
  • To: haiku-commits@xxxxxxxxxxxxx
  • Date: Fri, 12 Apr 2013 23:08:29 +0200 (CEST)

hrev45486 adds 1 changeset to branch 'master'
old head: a53db1893722eb4b5b25d5198113f8bf2a809fa3
new head: 3ef837fd409aa1dc999c886f3618348c8bee4751
overview: http://cgit.haiku-os.org/haiku/log/?qt=range&q=3ef837f+%5Ea53db18

----------------------------------------------------------------------------

3ef837f: If a submenu was opened, the parent menu tracking loop would continue 
calling
  _HitTestItems() even if the user didn't move the mouse.

                       [ Stefano Ceccherini <stefano.ceccherini@xxxxxxxxx> ]

----------------------------------------------------------------------------

Revision:    hrev45486
Commit:      3ef837fd409aa1dc999c886f3618348c8bee4751
URL:         http://cgit.haiku-os.org/haiku/commit/?id=3ef837f
Author:      Stefano Ceccherini <stefano.ceccherini@xxxxxxxxx>
Date:        Fri Apr 12 20:59:39 2013 UTC

----------------------------------------------------------------------------

1 file changed, 2 insertions(+), 1 deletion(-)
src/kits/interface/Menu.cpp | 3 ++-

----------------------------------------------------------------------------

diff --git a/src/kits/interface/Menu.cpp b/src/kits/interface/Menu.cpp
index 0485f97..7221611 100644
--- a/src/kits/interface/Menu.cpp
+++ b/src/kits/interface/Menu.cpp
@@ -1729,7 +1729,8 @@ BMenu::_Track(int* action, long start)
                                GetMouse(&newLocation, &newButtons, true);
                                UnlockLooper();
                        } while (newLocation == location && newButtons == 
buttons
-                               && !(item && item->Submenu() != NULL)
+                               && !(item != NULL && item->Submenu() != NULL
+                                               && item->Submenu()->Window() == 
NULL)
                                && fState == MENU_STATE_TRACKING);
 
                        if (newLocation != location || newButtons != buttons) {


Other related posts:

  • » [haiku-commits] haiku: hrev45486 - src/kits/interface - stefano . ceccherini