Changeset 17136

Timestamp:

04/15/06 12:57:51 (3 years ago)

Author:

jackburton

Message:

PopUpMenus didn't respect the openanyway setting (sticky mode), they always set it. And even in that case, they weren't working correctly. This should fix bugs 463 and 476. This might not work if click to open isn't selected in the menu prefs, though.

Location:

haiku/trunk/src/kits/interface

Files:

• Menu.cpp (modified) (2 diffs)
• PopUpMenu.cpp (modified) (1 diff)

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

@@ -960 +960 @@
 
 BMenuItem *
-BMenu::Track(bool openAnyway, BRect *clickToOpenRect)
-{
-        if (!IsStickyPrefOn())
-                openAnyway = false;
-                
-        SetStickyMode(openAnyway);
-        
-        if (openAnyway && LockLooper()) {
+BMenu::Track(bool sticky, BRect *clickToOpenRect)
+{       
+        if (sticky && LockLooper()) {
                 RedrawAfterSticky(Bounds());
                 UnlockLooper();
@@ -978 +973 @@
         }
 
+        // If sticky is false, pass 0 to the tracking function
+        // so the menu will stay in nonsticky mode, regardless
+        // of the "IsStickyPrefOn()" value
+        const bigtime_t trackTime = sticky ? system_time() : 0;
         int action;
-        BMenuItem *menuItem = _track(&action, system_time());
+        BMenuItem *menuItem = _track(&action, trackTime);
         
         SetStickyMode(false);

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

@@ -268 +268 @@
                 BRect *_specialRect, bool async)
 {
+        if (fTrackThread >= 0) {
+                // Something bad happened: Go() was called on us twice, and we got here
+                // while the other instance hasn't finished yet.
+                // TODO: Maybe we should simply call debugger() ?
+                status_t unused;
+                wait_for_thread(fTrackThread, &unused);
+        }
+
         BMenuItem *selected = NULL;