Ticket #7165: PopUpMenu.diff

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

@@ -317 +317 @@
 BPopUpMenu::_Go(BPoint where, bool autoInvoke, bool startOpened,
         BRect *_specialRect, bool async)
 {
-    // Force start opened. This is just better behavior.
-    startOpened = true;
 
-    BRect clickToOpenRect;
-
-    // If no click to open rect was provided make one around the opening
-    // point.
-    if (startOpened && _specialRect == NULL) {
-        clickToOpenRect.Set(where.x, where.y, where.x, where.y);
-        clickToOpenRect.InsetBy(-2, -2);
-        _specialRect = &clickToOpenRect;
-    }
-
     if (fTrackThread >= B_OK) {
         // we already have an active menu, wait for it to go away before
         // spawning another
@@ -430 +418 @@
     // called by BMenu::Track()
     fUseWhere = true;
 
+    // Determine when mouse-down-up will be taken as a 'press', rather than a 'click'
+    bigtime_t clickMaxTime = 0;
+    get_click_speed(&clickMaxTime);
+    clickMaxTime += system_time();
+    
     // Show the menu's window
     Show();
     snooze(50000);
     BMenuItem *result = Track(startOpened, _specialRect);
+    if (system_time() <= clickMaxTime)  // if it was a click
+        result = Track(true, _specialRect); // keep menu open and tracking
     if (result != NULL && autoInvoke)
         result->Invoke();