Changeset 88251 in vbox for trunk/src/VBox/Frontends

Timestamp:

Mar 22, 2021 4:49:33 PM (4 years ago)

Author:

vboxsync

Message:

FE/Qt: VirtualBox Manager: Tools pane: Make sure disabled items doesn't get focus on keyboard/mouse interactions.

Location:

trunk/src/VBox/Frontends/VirtualBox/src/manager/tools

Files:

• UIToolsHandlerKeyboard.cpp (modified) (2 diffs)
• UIToolsHandlerMouse.cpp (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/src/manager/tools/UIToolsHandlerKeyboard.cpp

@@ -65 +65 @@
             {
                 if (pEvent->key() == Qt::Key_Up)
-                    pPreviousItem = model()->navigationList().at(iPosition - 1);
+                    for (int i = iPosition - 1; i >= 0; --i)
+                    {
+                        UIToolsItem *pIteratedItem = model()->navigationList().at(i);
+                        if (pIteratedItem->isEnabled())
+                        {
+                            pPreviousItem = pIteratedItem;
+                            break;
+                        }
+                    }
                 else if (pEvent->key() == Qt::Key_Home)
                     pPreviousItem = model()->navigationList().first();
@@ -91 +99 @@
             {
                 if (pEvent->key() == Qt::Key_Down)
-                    pNextItem = model()->navigationList().at(iPosition + 1);
+                    for (int i = iPosition + 1; i < model()->navigationList().size(); ++i)
+                    {
+                        UIToolsItem *pIteratedItem = model()->navigationList().at(i);
+                        if (pIteratedItem->isEnabled())
+                        {
+                            pNextItem = pIteratedItem;
+                            break;
+                        }
+                    }
                 else if (pEvent->key() == Qt::Key_End)
                     pNextItem = model()->navigationList().last();

trunk/src/VBox/Frontends/VirtualBox/src/manager/tools/UIToolsHandlerMouse.cpp

@@ -63 +63 @@
                 UIToolsItem *pClickedItem = qgraphicsitem_cast<UIToolsItem*>(pItemUnderMouse);
                 /* Make clicked item the current one: */
-                if (pClickedItem)
+                if (pClickedItem && pClickedItem->isEnabled())
                 {
                     model()->setCurrentItem(pClickedItem);