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

Timestamp:

Jan 22, 2019 11:23:09 AM (6 years ago)

Author:

vboxsync

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

128308

Message:

FE/Qt: bugref:9241: VirtualBox Manager UI: Chooser pane: Show/handle tool button clicks for hovered items as well, not for chosen items only.

Location:

trunk/src/VBox/Frontends/VirtualBox/src/manager/chooser

Files:

• UIChooserHandlerMouse.cpp (modified) (2 diffs)
• UIChooserItemGlobal.cpp (modified) (1 diff)
• UIChooserItemMachine.cpp (modified) (1 diff)

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

@@ -72 +72 @@
                 {
                     const QPoint itemCursorPos = pGlobalItem->mapFromScene(scenePos).toPoint();
-                    if (model()->currentItem() == pGlobalItem && pGlobalItem->isToolsButtonArea(itemCursorPos))
+                    if (   pGlobalItem->isToolsButtonArea(itemCursorPos)
+                        && (   model()->currentItem() == pGlobalItem
+                            || pGlobalItem->isHovered()))
+                    {
                         model()->handleToolButtonClick(pGlobalItem);
+                        if (model()->currentItem() != pGlobalItem)
+                            pClickedItem = pGlobalItem;
+                    }
                     else
                         pClickedItem = pGlobalItem;
@@ -81 +87 @@
                 {
                     const QPoint itemCursorPos = pMachineItem->mapFromScene(scenePos).toPoint();
-                    if (model()->currentItem() == pMachineItem && pMachineItem->isToolsButtonArea(itemCursorPos))
+                    if (   pMachineItem->isToolsButtonArea(itemCursorPos)
+                        && (   model()->currentItem() == pMachineItem
+                            || pMachineItem->isHovered()))
+                    {
                         model()->handleToolButtonClick(pMachineItem);
+                        if (model()->currentItem() != pMachineItem)
+                            pClickedItem = pMachineItem;
+                    }
                     else
                         pClickedItem = pMachineItem;

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

@@ -777 +777 @@
 
     /* Paint right column: */
-    if (model()->currentItem() == this)
+    if (   model()->currentItem() == this
+        || isHovered())
     {
         /* Prepare variables: */

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

@@ -1288 +1288 @@
 
     /* Paint right column: */
-    if (model()->currentItem() == this)
+    if (   model()->currentItem() == this
+        || isHovered())
     {
         /* Prepare variables: */