Changeset 84565 in vbox for trunk

Timestamp:

May 27, 2020 2:16:01 PM (5 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:9653: VirtualBox Manager: Chooser pane: When deleting some VM and choosing non-selected element we should give priority to next one if possible, not previous; Besides that, global item is suitable as well.

File:

• trunk/src/VBox/Frontends/VirtualBox/src/manager/chooser/UIChooserModel.cpp (modified) (1 diff)

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

@@ -414 +414 @@
         while (idxBefore >= 0 || idxAfter < navigationItems().size())
         {
+            if (idxAfter < navigationItems().size())
+            {
+                pItem = navigationItems().at(idxAfter);
+                if (   !selectedItems().contains(pItem)
+                    && (   pItem->type() == UIChooserNodeType_Machine
+                        || pItem->type() == UIChooserNodeType_Global))
+                    return pItem;
+                ++idxAfter;
+            }
             if (idxBefore >= 0)
             {
                 pItem = navigationItems().at(idxBefore);
-                if (!selectedItems().contains(pItem) && pItem->type() == UIChooserNodeType_Machine)
+                if (   !selectedItems().contains(pItem)
+                    && (   pItem->type() == UIChooserNodeType_Machine
+                        || pItem->type() == UIChooserNodeType_Global))
                     return pItem;
                 --idxBefore;
-            }
-            if (idxAfter < navigationItems().size())
-            {
-                pItem = navigationItems().at(idxAfter);
-                if (!selectedItems().contains(pItem) && pItem->type() == UIChooserNodeType_Machine)
-                    return pItem;
-                ++idxAfter;
             }
         }