Changeset 108121 in vbox

Timestamp:

Feb 9, 2025 5:15:11 PM (12 days ago)

Author:

vboxsync

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

167420

Message:

FE/Qt: bugref:10814: VBox Manager / Tools pane: Handle all mouse buttons same way.

File:

• trunk/src/VBox/Frontends/VirtualBox/src/manager/tools/UIToolsModel.cpp (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/src/manager/tools/UIToolsModel.cpp

@@ -419 +419 @@
             if (QGraphicsItem *pItemUnderMouse = itemAt(scenePos))
             {
-                /* Which button it was? */
-                switch (pMouseEvent->button())
+                /* Which item we just clicked? */
+                UIToolsItem *pClickedItem = qgraphicsitem_cast<UIToolsItem*>(pItemUnderMouse);
+                if (pClickedItem)
                 {
-                    /* Both buttons: */
-                    case Qt::LeftButton:
-                    case Qt::RightButton:
+                    /* Do we have extra-button? */
+                    if (pClickedItem->hasExtraButton())
                     {
-                        /* Which item we just clicked? */
-                        UIToolsItem *pClickedItem = qgraphicsitem_cast<UIToolsItem*>(pItemUnderMouse);
-                        if (pClickedItem)
+                        /* Check if clicked place is within extra-button geometry: */
+                        const QPointF itemPos = pClickedItem->mapFromParent(scenePos);
+                        if (pClickedItem->extraButtonRect().contains(itemPos.toPoint()))
                         {
-                            /* Do we have extra-button? */
-                            if (pClickedItem->hasExtraButton())
+                            /* Handle known button types: */
+                            switch (pClickedItem->itemType())
                             {
-                                /* Check if clicked place is within extra-button geometry: */
-                                const QPointF itemPos = pClickedItem->mapFromParent(scenePos);
-                                if (pClickedItem->extraButtonRect().contains(itemPos.toPoint()))
+                                case UIToolType_Home:
                                 {
-                                    /* Handle known button types: */
-                                    switch (pClickedItem->itemType())
-                                    {
-                                        case UIToolType_Home:
-                                        {
-                                            /* Toggle the button: */
-                                            m_fShowItemNames = !m_fShowItemNames;
-                                            /* Update geometry for all the items: */
-                                            foreach (UIToolsItem *pItem, m_items)
-                                                pItem->updateGeometry();
-                                            /* Recalculate layout: */
-                                            updateLayout();
-                                            break;
-                                        }
-                                        default:
-                                            break;
-                                    }
+                                    /* Toggle the button: */
+                                    m_fShowItemNames = !m_fShowItemNames;
+                                    /* Update geometry for all the items: */
+                                    foreach (UIToolsItem *pItem, m_items)
+                                        pItem->updateGeometry();
+                                    /* Recalculate layout: */
+                                    updateLayout();
+                                    break;
                                 }
-                            }
-
-                            /* Make clicked item the current one: */
-                            if (pClickedItem->isEnabled())
-                            {
-                                setCurrentItem(pClickedItem);
-                                /* Close the widget in popup mode only: */
-                                if (tools()->isPopup())
-                                    close();
-                                return true;
+                                default:
+                                    break;
                             }
                         }
-                        break;
                     }
-                    default:
-                        break;
+
+                    /* Make clicked item the current one: */
+                    if (pClickedItem->isEnabled())
+                    {
+                        setCurrentItem(pClickedItem);
+                        /* Close the widget in popup mode only: */
+                        if (tools()->isPopup())
+                            close();
+                        return true;
+                    }
                 }
             }