Ticket #4930: menu-kb-nav.patch

../src/kits/interface/Menu.cpp

@@ -372 +372 @@
     // when called on input_server initialization, since it tries
     // to send a synchronous message to itself (input_server is
     // a BApplication)
-
     BMenu::sAltAsCommandKey = true;
     key_map* keys = NULL;
     char* chars = NULL;
@@ -383 +382 @@
     free(chars);
     free(keys);
 
-    BMenuItem* superItem = Superitem();
-    BMenu* superMenu = Supermenu();
-    if (AddDynamicItem(B_INITIAL_ADD)) {
-        do {
-            if (superMenu != NULL && !superMenu->_OkToProceed(superItem)) {
-                AddDynamicItem(B_ABORT);
-                fAttachAborted = true;
-                break;
-            }
-        } while (AddDynamicItem(B_PROCESSING));
-    }
-
-    if (!fAttachAborted) {
-        _CacheFontInfo();
-        _LayoutItems(0);
-        _UpdateWindowViewSize(false);
-    }
+    _CacheFontInfo();
+    _LayoutItems(0);
+    _UpdateWindowViewSize(false);
 }
 
 
@@ -515 +500 @@
                 _SelectNextItem(fSelected, true);
             else {
                 if (fSelected && fSelected->Submenu()) {
-                    _SelectItem(fSelected, true, true);
+                    fSelected->Submenu()->_SetStickyMode(true);
+                        // fix me: this shouldn't be needed but dynamic menus
+                        // aren't getting it set correctly when keyboard
+                        // navigating, which aborts the attach
+                    _SelectItem(fSelected, true, true, true);
                 } else if (dynamic_cast<BMenuBar*>(Supermenu())) {
                     // if we have no submenu and we're an
                     // item in the top menu below the menubar,
@@ -1462 +1451 @@
 
 
 bool
-BMenu::_Show(bool selectFirstItem)
+BMenu::_Show(bool selectFirstItem, bool keyDown)
 {
     // See if the supermenu has a cached menuwindow,
     // and use that one if possible.
@@ -1487 +1476 @@
 
     if (window->Lock()) {
         fAttachAborted = false;
-        window->AttachMenu(this);
 
-        if (ItemAt(0) != NULL) {
-            float width, height;
-            ItemAt(0)->GetContentSize(&width, &height);
-
-            window->SetSmallStep(ceilf(height));
+        BMenuItem* superItem = Superitem();
+        BMenu* superMenu = Supermenu();
+        if (AddDynamicItem(B_INITIAL_ADD)) {
+            do {
+                if (superMenu != NULL
+                        && !superMenu->_OkToProceed(superItem, keyDown)) {
+                    AddDynamicItem(B_ABORT);
+                    fAttachAborted = true;
+                    break;
+                }
+            } while (AddDynamicItem(B_PROCESSING));
         }
 
+        if (!fAttachAborted) {
+            window->AttachMenu(this);
+
+            if (ItemAt(0) != NULL) {
+                float width, height;
+                ItemAt(0)->GetContentSize(&width, &height);
+                window->SetSmallStep(ceilf(height));
+            }
+        } else {
         // Menu didn't have the time to add its items: aborting...
-        if (fAttachAborted) {
-            window->DetachMenu();
-            // TODO: Probably not needed, we can just let _hide() quit the
-            // window.
             if (ourWindow)
                 window->Quit();
             else
@@ -2499 +2498 @@
 
 
 void
-BMenu::_SelectItem(BMenuItem* menuItem, bool showSubmenu, bool selectFirstItem)
+BMenu::_SelectItem(BMenuItem* menuItem, bool showSubmenu,
+                        bool selectFirstItem, bool keyDown)
 {
     // Avoid deselecting and then reselecting the same item
     // which would cause flickering
@@ -2519 +2519 @@
     if (fSelected != NULL && showSubmenu) {
         BMenu* subMenu = fSelected->Submenu();
         if (subMenu != NULL && subMenu->Window() == NULL) {
-            if (!subMenu->_Show(selectFirstItem)) {
+            if (!subMenu->_Show(selectFirstItem, keyDown)) {
                 // something went wrong, deselect the item
                 fSelected->Select(false);
                 fSelected = NULL;
@@ -2729 +2729 @@
 
 
 bool
-BMenu::_OkToProceed(BMenuItem* item)
+BMenu::_OkToProceed(BMenuItem* item, bool keyDown)
 {
     BPoint where;
     ulong buttons;
@@ -2742 +2742 @@
     // BeOS seems to do something similar. This could also be a bug in
     // Deskbar, though.
     if ((buttons != 0 && stickyMode)
-        || ((dynamic_cast<BMenuBar*>(this) == NULL
-            && (buttons == 0 && !stickyMode)) || _HitTestItems(where) != item))
+            || (dynamic_cast<BMenuBar*>(this) == NULL
+                && (buttons == 0 && !stickyMode))
+            || ((_HitTestItems(where) != item) && !keyDown))
         return false;
 
     return true;

../headers/os/interface/Menu.h

@@ -183 +183 @@
             BMenu&              operator=(const BMenu& other);
 
             void                _InitData(BMessage* archive);
-            bool                _Show(bool selectFirstItem = false);
+            bool                _Show(bool selectFirstItem = false,
+                                    bool keyDown = false);
             void                _Hide();
             BMenuItem*          _Track(int* action, long start = -1);
 
@@ -212 +213 @@
             void                _ComputeColumnLayout(int32 index, bool bestFit,
                                     bool moveItems, BRect& outRect);
             void                _ComputeRowLayout(int32 index, bool bestFit,
-                                    bool moveItems, BRect& outRect);        
+                                    bool moveItems, BRect& outRect);
             void                _ComputeMatrixLayout(BRect& outRect);
 
             BRect               _CalcFrame(BPoint where, bool* scrollOn);
@@ -235 +236 @@
             void                _Uninstall();
             void                _SelectItem(BMenuItem* item,
                                     bool showSubmenu = true,
-                                    bool selectFirstItem = false);
+                                    bool selectFirstItem = false,
+                                    bool keyDown = false);
             bool                _SelectNextItem(BMenuItem* item, bool forward);
             BMenuItem*          _NextItem(BMenuItem* item, bool forward) const;
             void                _SetIgnoreHidden(bool on);
@@ -246 +248 @@
                                     uint32& trigger,
                                     BPrivate::TriggerList& triggers);
             void                _UpdateWindowViewSize(const bool &updatePosition);
-            bool                _OkToProceed(BMenuItem* item);
+            bool                _OkToProceed(BMenuItem* item,
+                                    bool keyDown = false);
 
             bool                _CustomTrackingWantsToQuit();