Changeset 43554 in vbox

Timestamp:

Oct 5, 2012 11:07:09 AM (12 years ago)

Author:

vboxsync

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

81166

Message:

FE/Qt: VM group feature UI: Mouse-handler cleanup (part 2).

File:

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

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

@@ -74 +74 @@
                 if (pClickedItem && !pClickedItem->isRoot())
                 {
-                    /* Old selection list: */
-                    QList<UIGChooserItem*> oldSelectionList = model()->currentItems();
-                    /* Move focus to clicked item: */
-                    model()->setFocusItem(pClickedItem);
                     /* Was 'shift' modifier pressed? */
                     if (pEvent->modifiers() == Qt::ShiftModifier)
@@ -85 +81 @@
                         int iFirstPosition = model()->navigationList().indexOf(pFirstItem);
                         int iClickedPosition = model()->navigationList().indexOf(pClickedItem);
-                        /* Clear selection: */
-                        model()->clearSelectionList();
-                        /* Select all the items from 'first' to 'clicked': */
+                        /* Populate list of items from 'first' to 'clicked': */
+                        QList<UIGChooserItem*> items;
                         if (iFirstPosition <= iClickedPosition)
                             for (int i = iFirstPosition; i <= iClickedPosition; ++i)
-                                model()->addToCurrentItems(model()->navigationList().at(i));
+                                items << model()->navigationList().at(i);
                         else
                             for (int i = iFirstPosition; i >= iClickedPosition; --i)
-                                model()->addToCurrentItems(model()->navigationList().at(i));
+                                items << model()->navigationList().at(i);
+                        /* Set that list as current: */
+                        model()->setCurrentItems(items);
+                        /* Move focus to clicked item: */
+                        model()->setFocusItem(pClickedItem);
                     }
                     /* Was 'control' modifier pressed? */
                     else if (pEvent->modifiers() == Qt::ControlModifier)
                     {
-                        /* Select clicked item, inverting if necessary: */
+                        /* Invert selection state for clicked item: */
                         if (model()->currentItems().contains(pClickedItem))
                             model()->removeFromCurrentItems(pClickedItem);
                         else
                             model()->addToCurrentItems(pClickedItem);
+                        /* Move focus to clicked item: */
+                        model()->setFocusItem(pClickedItem);
                     }
                     /* Was no modifiers pressed? */
                     else if (pEvent->modifiers() == Qt::NoModifier)
                     {
-                        /* Move selection to clicked item: */
-                        model()->clearSelectionList();
-                        model()->addToCurrentItems(pClickedItem);
-                    }
-                    /* Selection list changed?: */
-                    if (oldSelectionList != model()->currentItems())
-                        model()->notifyCurrentItemChanged();
+                        /* Make clicked item the current one: */
+                        model()->setCurrentItem(pClickedItem);
+                    }
                 }
                 break;
@@ -129 +126 @@
                     pClickedItem = pMachineItem;
                 /* If we had clicked one of required item types: */
-                if (pClickedItem)
-                {
-                    /* For non-root items: */
-                    if (!pClickedItem->isRoot())
-                    {
-                        /* Move focus to clicked item (with selection if not selected yet): */
+                if (pClickedItem && !pClickedItem->isRoot())
+                {
+                    /* Select clicked item if not selected yet: */
+                    if (!model()->currentItems().contains(pClickedItem))
                         model()->setCurrentItem(pClickedItem);
-                    }
                 }
                 break;