Changeset 43551 in vbox

Timestamp:

Oct 5, 2012 10:38:14 AM (12 years ago)

Author:

vboxsync

Message:

FE/Qt: VM group feature UI: Group-item cleanup (part 1): Open group on dropping something into it.

File:

• trunk/src/VBox/Frontends/VirtualBox/src/selector/graphics/chooser/UIGChooserItemGroup.cpp (modified) (5 diffs)

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

@@ -165 +165 @@
     if (model()->focusItem() == this)
     {
-        /* Unset the focus/selection: */
-        model()->setFocusItem(0, true);
-    }
-    /* If that item is NOT focused, but selected: */
-    else if (model()->currentItems().contains(this))
+        /* Unset the focus: */
+        model()->setFocusItem(0);
+    }
+    /* If that item is selected: */
+    if (model()->currentItems().contains(this))
     {
         /* Remove item from the selection list: */
@@ -1069 +1069 @@
                 /* Copy passed item into this group: */
                 UIGChooserItem *pNewGroupItem = new UIGChooserItemGroup(this, pItem->toGroupItem(), iPosition);
+                if (closed())
+                    open(false);
 
                 /* If proposed action is 'move': */
@@ -1081 +1083 @@
                 pModel->updateNavigation();
                 pModel->updateLayout();
-                pModel->setCurrentItem(pNewGroupItem->parentItem()->toGroupItem()->opened() ?
-                                       pNewGroupItem : pNewGroupItem->parentItem());
+                pModel->setCurrentItem(pNewGroupItem);
                 pModel->saveGroupSettings();
                 break;
@@ -1121 +1122 @@
                 /* Copy passed machine item into this group: */
                 UIGChooserItem *pNewMachineItem = new UIGChooserItemMachine(this, pItem->toMachineItem(), iPosition);
+                if (closed())
+                    open(false);
 
                 /* If proposed action is 'move': */
@@ -1133 +1136 @@
                 pModel->updateNavigation();
                 pModel->updateLayout();
-                pModel->setCurrentItem(pNewMachineItem->parentItem()->toGroupItem()->opened() ?
-                                       pNewMachineItem : pNewMachineItem->parentItem());
+                pModel->setCurrentItem(pNewMachineItem);
                 pModel->saveGroupSettings();
                 break;