Changeset 96972 in vbox

Timestamp:

Oct 3, 2022 5:13:49 PM (2 years ago)

Author:

vboxsync

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

153893

Message:

FE/Qt: bugref:9930: VirtualBox Manager / Chooser pane: Improving mouse ctrl/shift interactions to avoid choosing items of inconsistent types simultaneously.

File:

• trunk/src/VBox/Frontends/VirtualBox/src/manager/chooser/UIChooserHandlerMouse.cpp (modified) (3 diffs)

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

@@ -121 +121 @@
                         /* Calculate positions: */
                         UIChooserItem *pFirstItem = model()->firstSelectedItem();
-                        int iFirstPosition = model()->navigationItems().indexOf(pFirstItem);
-                        int iClickedPosition = model()->navigationItems().indexOf(pClickedItem);
+                        AssertPtrReturn(pFirstItem, false); // is failure possible?
+                        const int iFirstPosition = model()->navigationItems().indexOf(pFirstItem);
+                        const int iClickedPosition = model()->navigationItems().indexOf(pClickedItem);
                         /* Populate list of items from 'first' to 'clicked': */
                         QList<UIChooserItem*> items;
@@ -131 +132 @@
                             for (int i = iFirstPosition; i >= iClickedPosition; --i)
                                 items << model()->navigationItems().at(i);
+                        /* Wipe out items of inconsistent types: */
+                        QList<UIChooserItem*> filteredItems;
+                        foreach (UIChooserItem *pIteratedItem, items)
+                        {
+                            /* So, the logic is to add intermediate item if
+                             * - first and intermediate selected items are global or
+                             * - first and intermediate selected items are NOT global. */
+                            if (   (   pFirstItem->type() == UIChooserNodeType_Global
+                                    && pIteratedItem->type() == UIChooserNodeType_Global)
+                                || (   pFirstItem->type() != UIChooserNodeType_Global
+                                    && pIteratedItem->type() != UIChooserNodeType_Global))
+                                filteredItems << pIteratedItem;
+                        }
                         /* Make that list selected: */
-                        model()->setSelectedItems(items);
-                        /* Make clicked item current one: */
-                        model()->setCurrentItem(pClickedItem);
+                        model()->setSelectedItems(filteredItems);
+                        /* Make item closest to clicked the current one: */
+                        if (!filteredItems.isEmpty())
+                            model()->setCurrentItem(filteredItems.last());
                     }
                     /* Was 'control' modifier pressed? */
@@ -143 +158 @@
                             model()->removeFromSelectedItems(pClickedItem);
                         else
-                            model()->addToSelectedItems(pClickedItem);
+                        {
+                            /* So, the logic is to add newly clicked item if
+                             * - previously and newly selected items are global or
+                             * - previously and newly selected items are NOT global. */
+                            UIChooserItem *pFirstItem = model()->firstSelectedItem();
+                            AssertPtrReturn(pFirstItem, false); // is failure possible?
+                            if (   (   pFirstItem->type() == UIChooserNodeType_Global
+                                    && pClickedItem->type() == UIChooserNodeType_Global)
+                                || (   pFirstItem->type() != UIChooserNodeType_Global
+                                    && pClickedItem->type() != UIChooserNodeType_Global))
+                                model()->addToSelectedItems(pClickedItem);
+                        }
                         /* Make clicked item current one: */
                         model()->setCurrentItem(pClickedItem);