Changeset 97007 in vbox

Timestamp:

Oct 5, 2022 3:40:19 PM (2 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

153939

Message:

FE/Qt: bugref:9930: VirtualBox Manager / Chooser pane: Improving keyboard shift interactions to avoid choosing items of inconsistent types simultaneously.

File:

• trunk/src/VBox/Frontends/VirtualBox/src/manager/chooser/UIChooserHandlerKeyboard.cpp (modified) (3 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/manager/chooser/UIChooserHandlerKeyboard.cpp

@@ -98 +98 @@
             {
                 /* Determine current-item position: */
-                int iPosition = model()->navigationItems().indexOf(model()->currentItem());
+                UIChooserItem *pCurrentItem = model()->currentItem();
+                int iPosition = model()->navigationItems().indexOf(pCurrentItem);
                 /* Determine 'previous' item: */
                 UIChooserItem *pPreviousItem = 0;
                 if (iPosition > 0)
                 {
-                    if (pEvent->key() == Qt::Key_Up)
-                        pPreviousItem = model()->navigationItems().at(iPosition - 1);
-                    else if (pEvent->key() == Qt::Key_Home)
-                        pPreviousItem = model()->navigationItems().first();
+                    if (   pEvent->key() == Qt::Key_Up
+                        || pEvent->key() == Qt::Key_Home)
+                    {
+                        UIChooserItem *pPossiblePreviousItem = 0;
+                        const int iLimit = pEvent->key() == Qt::Key_Up ? iPosition - 1 : 0;
+                        for (int i = iPosition - 1; i >= iLimit; --i)
+                        {
+                            pPossiblePreviousItem = model()->navigationItems().at(i);
+                            if ((      pCurrentItem->type() == UIChooserNodeType_Global
+                                    && pPossiblePreviousItem->type() == UIChooserNodeType_Global)
+                                || (   pCurrentItem->type() != UIChooserNodeType_Global
+                                    && pPossiblePreviousItem->type() != UIChooserNodeType_Global))
+                                pPreviousItem = pPossiblePreviousItem;
+                        }
+                    }
                 }
                 if (pPreviousItem)
@@ -191 +203 @@
             {
                 /* Determine current-item position: */
-                int iPosition = model()->navigationItems().indexOf(model()->currentItem());
+                UIChooserItem *pCurrentItem = model()->currentItem();
+                int iPosition = model()->navigationItems().indexOf(pCurrentItem);
                 /* Determine 'next' item: */
                 UIChooserItem *pNextItem = 0;
                 if (iPosition < model()->navigationItems().size() - 1)
                 {
-                    if (pEvent->key() == Qt::Key_Down)
-                        pNextItem = model()->navigationItems().at(iPosition + 1);
-                    else if (pEvent->key() == Qt::Key_End)
-                        pNextItem = model()->navigationItems().last();
+                    if (   pEvent->key() == Qt::Key_Down
+                        || pEvent->key() == Qt::Key_End)
+                    {
+                        UIChooserItem *pPossibleNextItem = 0;
+                        const int iLimit = pEvent->key() == Qt::Key_Down ? iPosition + 1 : 0;
+                        for (int i = iPosition + 1; i <= iLimit; ++i)
+                        {
+                            pPossibleNextItem = model()->navigationItems().at(i);
+                            if ((      pCurrentItem->type() == UIChooserNodeType_Global
+                                    && pPossibleNextItem->type() == UIChooserNodeType_Global)
+                                || (   pCurrentItem->type() != UIChooserNodeType_Global
+                                    && pPossibleNextItem->type() != UIChooserNodeType_Global))
+                                pNextItem = pPossibleNextItem;
+                        }
+                    }
                 }
                 if (pNextItem)
@@ -361 +385 @@
                 {
                     case UIItemShiftSize_Item: iNewCurrentNodePosition = iCurrentNodePosition + 2; break;
-                    case UIItemShiftSize_Full: iNewCurrentNodePosition = pParentNode->nodes(pCurrentNode->type()).size();  break;
+                    case UIItemShiftSize_Full: iNewCurrentNodePosition = pParentNode->nodes(pCurrentNode->type()).size(); break;
                     default: break;
                 }