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

Timestamp:

Feb 4, 2025 2:07:59 PM (3 months ago)

Author:

vboxsync

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

167341

Message:

FE/Qt: bugref:10814: VBox Manager / Tools pane: Proper handling for extra-button click; Taking into account button type and exact geometry.

Location:

trunk/src/VBox/Frontends/VirtualBox/src/manager/tools

Files:

• UIToolsItem.cpp (modified) (2 diffs)
• UIToolsItem.h (modified) (2 diffs)
• UIToolsModel.cpp (modified) (1 diff)

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

@@ -899 +899 @@
 
     /* Prepare button sub-rect: */
-    QRect subRect;
-    subRect.setWidth(iButtonWidth);
-    subRect.setHeight(rectangle.height() / 2);
-    subRect.moveTopLeft(QPoint(rectangle.right() - subRect.width() - 2,
-                               rectangle.bottom() - 3 * rectangle.height() / 4 + 1));
+    m_extraButtonRect.setWidth(iButtonWidth);
+    m_extraButtonRect.setHeight(rectangle.height() / 2);
+    m_extraButtonRect.moveTopLeft(QPoint(rectangle.right() - m_extraButtonRect.width() - 2,
+                                         rectangle.bottom() - 3 * rectangle.height() / 4 + 1));
 
     /* Paint button frame: */
     QPainterPath painterPath;
-    painterPath.addRoundedRect(subRect, iPadding, iPadding);
+    painterPath.addRoundedRect(m_extraButtonRect, iPadding, iPadding);
     QColor backgroundColor1 = uiCommon().isInDarkMode()
                             ? backgroundColor.lighter(110)
@@ -919 +918 @@
                             ? backgroundColor.lighter(180)
                             : backgroundColor.darker(140);
-    pPainter->fillRect(subRect, backgroundColor2);
+    pPainter->fillRect(m_extraButtonRect, backgroundColor2);
 
     /* Paint arrow: */
     if (!model()->showItemNames())
     {
-        pPainter->drawLine(subRect.topLeft() + QPoint(3, 3), QPoint(subRect.right() - 2, subRect.center().y()));
-        pPainter->drawLine(subRect.bottomLeft() + QPoint(3, -3), QPoint(subRect.right() - 2, subRect.center().y()));
+        pPainter->drawLine(m_extraButtonRect.topLeft() + QPoint(3, 3),
+                           QPoint(m_extraButtonRect.right() - 2, m_extraButtonRect.center().y()));
+        pPainter->drawLine(m_extraButtonRect.bottomLeft() + QPoint(3, -3),
+                           QPoint(m_extraButtonRect.right() - 2, m_extraButtonRect.center().y()));
     }
     else
     {
-        pPainter->drawLine(subRect.topRight() + QPoint(-3, 3), QPoint(subRect.left() + 3, subRect.center().y()));
-        pPainter->drawLine(subRect.bottomRight() + QPoint(-3, -3), QPoint(subRect.left() + 3, subRect.center().y()));
+        pPainter->drawLine(m_extraButtonRect.topRight() + QPoint(-3, 3),
+                           QPoint(m_extraButtonRect.left() + 3, m_extraButtonRect.center().y()));
+        pPainter->drawLine(m_extraButtonRect.bottomRight() + QPoint(-3, -3),
+                           QPoint(m_extraButtonRect.left() + 3, m_extraButtonRect.center().y()));
     }
 

trunk/src/VBox/Frontends/VirtualBox/src/manager/tools/UIToolsItem.h

@@ -139 +139 @@
           * @param  constraint  Brings size constraint. */
         virtual QSizeF sizeHint(Qt::SizeHint enmWhich, const QSizeF &constraint = QSizeF()) const RT_OVERRIDE;
+
+        /** Returns the extra-button rectangle. */
+        QRect extraButtonRect() const { return m_extraButtonRect; }
     /** @} */
 
@@ -309 +312 @@
         /** Holds the name size. */
         QSize  m_nameSize;
+
+        /** Holds the extra-button rectangle. */
+        mutable QRect  m_extraButtonRect;
     /** @} */
 };

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

@@ -442 +442 @@
                         if (pClickedItem)
                         {
-                            /* Toggle the button: */
+                            /* Do we have extra-button? */
                             if (pClickedItem->hasExtraButton())
                             {
-                                m_fShowItemNames = !m_fShowItemNames;
-                                foreach (UIToolsItem *pItem, m_items)
-                                    pItem->updateGeometry();
-                                updateLayout();
+                                /* Check if clicked place is within extra-button geometry: */
+                                const QPointF itemPos = pClickedItem->mapFromParent(scenePos);
+                                if (pClickedItem->extraButtonRect().contains(itemPos.toPoint()))
+                                {
+                                    /* Handle known button types: */
+                                    switch (pClickedItem->itemType())
+                                    {
+                                        case UIToolType_Welcome:
+                                        {
+                                            /* 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;
+                                    }
+                                }
                             }