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

Timestamp:

Jan 3, 2018 6:05:20 PM (7 years ago)

Author:

vboxsync

Message:

FE/Qt: Don't jump to the top of the VM list after deletion, pick something close by.

Location:

trunk/src/VBox/Frontends/VirtualBox/src/selector/graphics/chooser

Files:

• UIGChooserModel.cpp (modified) (2 diffs)
• UIGChooserModel.h (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/src/selector/graphics/chooser/UIGChooserModel.cpp

@@ -349 +349 @@
     /* Call for wrapper above: */
     setCurrentItems(list);
+}
+
+UIGChooserItem* UIGChooserModel::findClosestUnselectedItem() const
+{
+    /*
+     * Take the focus item (if any) as a starting point and find
+     * the closest non-selected item
+     */
+    UIGChooserItem *pItem = focusItem();
+    if (!pItem)
+        pItem = currentItem();
+    if (pItem)
+    {
+        int idxBefore = navigationList().indexOf(pItem) - 1;
+        int idxAfter  = idxBefore + 2;
+        while(idxBefore >= 0 || idxAfter < navigationList().size())
+        {
+            if (idxBefore >= 0)
+            {
+                pItem = navigationList().at(idxBefore);
+                if (!currentItems().contains(pItem))
+                    return pItem;
+                idxBefore--;
+            }
+            if (idxAfter < navigationList().size())
+            {
+                pItem = navigationList().at(idxAfter);
+                if (!currentItems().contains(pItem))
+                    return pItem;
+                idxAfter++;
+            }
+        }
+    }
+    return 0;
 }
 
@@ -1527 +1561 @@
         return;
 
-    /* Unset current item(s): */
-    unsetCurrentItem();
+    /* Change selection to some close by item: */
+    setCurrentItem(findClosestUnselectedItem());
 
     /* For every selected item: */

trunk/src/VBox/Frontends/VirtualBox/src/selector/graphics/chooser/UIGChooserModel.h

@@ -120 +120 @@
     void addToCurrentItems(UIGChooserItem *pItem);
     void removeFromCurrentItems(UIGChooserItem *pItem);
+    UIGChooserItem* findClosestUnselectedItem() const;
     void makeSureSomeItemIsSelected();
     void notifyCurrentItemChanged();