Changeset 108125 in vbox for trunk

Timestamp:

Feb 9, 2025 6:03:50 PM (3 months ago)

Author:

vboxsync

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

167424

Message:

FE/Qt: bugref:10814: VBox Manager / Tools pane: Wipe out extra-button code for now.

Location:

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

Files:

• UIToolsItem.cpp (modified) (4 diffs)
• UIToolsItem.h (modified) (7 diffs)
• UIToolsModel.cpp (modified) (3 diffs)
• UIToolsModel.h (modified) (2 diffs)

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

@@ -187 +187 @@
 
 UIToolsItem::UIToolsItem(QGraphicsScene *pScene, const QIcon &icon,
-                         UIToolClass enmClass, UIToolType enmType,
-                         bool fExtraButton /* = false */)
+                         UIToolClass enmClass, UIToolType enmType)
     : m_pScene(pScene)
     , m_icon(icon)
     , m_enmClass(enmClass)
     , m_enmType(enmType)
-    , m_fExtraButton(fExtraButton)
     , m_fHovered(false)
     , m_pHoveringMachine(0)
@@ -402 +400 @@
     /* Paint tool info: */
     paintToolInfo(pPainter, rectangle);
-    /* Paint extra-button if requested: */
-    if (   m_fExtraButton
-        && model()->isAtLeastOneItemHovered())
-        paintExtraButton(pPainter, rectangle);
 }
 
@@ -578 +572 @@
         case ToolsItemData_Spacing: return QApplication::style()->pixelMetric(QStyle::PM_SmallIconSize) / 2;
         case ToolsItemData_Padding: return 4;
-        case ToolsItemData_ExtraButtonWidth: return 10;
 
         /* Default: */
@@ -935 +928 @@
 }
 
-void UIToolsItem::paintExtraButton(QPainter *pPainter, const QRect &rectangle) const
-{
-    /* Prepare variables: */
-    const int iPadding = data(ToolsItemData_Padding).toInt();
-    const int iButtonWidth = data(ToolsItemData_ExtraButtonWidth).toInt();
-
-    /* Save painter: */
-    pPainter->save();
-
-    /* Configure painter: */
-    pPainter->setRenderHint(QPainter::Antialiasing, true);
-    /* Acquire background color: */
-    const QPalette pal = QApplication::palette();
-#ifdef VBOX_WS_MAC
-    const QColor backgroundColor = pal.color(QPalette::Active, QPalette::Window);
-#else /* !VBOX_WS_MAC */
-    const QColor windowColor = pal.color(QPalette::Active, QPalette::Window);
-    const QColor accentColor = pal.color(QPalette::Active, QPalette::Accent);
-    const int iRed = iShift30(windowColor.red(), accentColor.red());
-    const int iGreen = iShift30(windowColor.green(), accentColor.green());
-    const int iBlue = iShift30(windowColor.blue(), accentColor.blue());
-    const QColor backgroundColor = QColor(qRgb(iRed, iGreen, iBlue));
-#endif /* !VBOX_WS_MAC */
-
-    /* Prepare button sub-rect: */
-    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(m_extraButtonRect, iPadding, iPadding);
-#ifdef VBOX_WS_MAC
-    const QColor backgroundColor1 = uiCommon().isInDarkMode()
-                                  ? backgroundColor.lighter(220)
-                                  : backgroundColor.darker(140);
-#else /* !VBOX_WS_MAC */
-    const QColor backgroundColor1 = uiCommon().isInDarkMode()
-                                  ? backgroundColor.lighter(140)
-                                  : backgroundColor.darker(120);
-#endif /* !VBOX_WS_MAC */
-    pPainter->setPen(QPen(backgroundColor1, 2, Qt::SolidLine, Qt::RoundCap));
-    pPainter->drawPath(QPainterPathStroker().createStroke(painterPath));
-
-    /* Fill button body: */
-    pPainter->setClipPath(painterPath);
-#ifdef VBOX_WS_MAC
-    const QColor backgroundColor2 = uiCommon().isInDarkMode()
-                                  ? backgroundColor.lighter(160)
-                                  : backgroundColor.darker(120);
-#else /* !VBOX_WS_MAC */
-    const QColor backgroundColor2 = uiCommon().isInDarkMode()
-                                  ? backgroundColor.lighter(105)
-                                  : backgroundColor.darker(105);
-#endif /* !VBOX_WS_MAC */
-    pPainter->fillRect(m_extraButtonRect, backgroundColor2);
-
-    /* Paint arrow: */
-    if (!model()->showItemNames())
-    {
-        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(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()));
-    }
-
-    /* Restore painter: */
-    pPainter->restore();
-}
-
 /* static */
 void UIToolsItem::paintPixmap(QPainter *pPainter, const QPoint &point,

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

@@ -87 +87 @@
       * @param  icon          Brings the item icon.
       * @param  enmClass      Brings the item class.
-      * @param  enmType       Brings the item type.
-      * @param  fExtraButton  Brings whether item should have extra-button. */
+      * @param  enmType       Brings the item type. */
     UIToolsItem(QGraphicsScene *pScene, const QIcon &icon,
-                UIToolClass enmClass, UIToolType enmType,
-                bool fExtraButton = false);
+                UIToolClass enmClass, UIToolType enmType);
     /** Destructs item. */
     virtual ~UIToolsItem() RT_OVERRIDE;
@@ -113 +111 @@
         UIToolType itemType() const { return m_enmType; }
 
-        /** Returns whether item should have extra-button. */
-        bool hasExtraButton() const { return m_fExtraButton; }
-
         /** Defines whether item is @a fEnabled. */
         void setEnabled(bool fEnabled);
@@ -139 +134 @@
           * @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; }
     /** @} */
 
@@ -177 +169 @@
         ToolsItemData_Spacing,
         ToolsItemData_Padding,
-        ToolsItemData_ExtraButtonWidth,
     };
 
@@ -233 +224 @@
           * @param  rectangle  Brings the rectangle to limit painting with. */
         void paintToolInfo(QPainter *pPainter, const QRect &rectangle) const;
-        /** Paints extra-button using using passed @a pPainter.
-          * @param  rectangle  Brings the rectangle to limit painting with. */
-        void paintExtraButton(QPainter *pPainter, const QRect &rectangle) const;
 
         /** Paints @a pixmap using passed @a pPainter.
@@ -267 +255 @@
         /** Holds the item type. */
         UIToolType      m_enmType;
-        /** Holds whether item should have extra-button. */
-        bool            m_fExtraButton;
 
         /** Holds the item pixmap. */
@@ -317 +303 @@
         /** 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

@@ -323 +323 @@
 {
     return m_fShowItemNames;
-}
-
-bool UIToolsModel::isAtLeastOneItemHovered() const
-{
-    foreach (UIToolsItem *pItem, items())
-        if (pItem->isHovered())
-            return true;
-    return false;
 }
 
@@ -503 +495 @@
 }
 
-void UIToolsModel::sltHandleItemHoverChange()
-{
-    /* Just update all the items: */
-    foreach (UIToolsItem *pItem, items())
-        pItem->update();
-}
-
 void UIToolsModel::sltFocusItemDestroyed()
 {
@@ -651 +636 @@
     connect(&translationEventListener(), &UITranslationEventListener::sigRetranslateUI,
             this, &UIToolsModel::sltRetranslateUI);
-
-    /* Connect item hover listeners: */
-    foreach (UIToolsItem *pItem, m_items)
-    {
-        connect(pItem, &UIToolsItem::sigHoverEnter,
-                this, &UIToolsModel::sltHandleItemHoverChange);
-        connect(pItem, &UIToolsItem::sigHoverLeave,
-                this, &UIToolsModel::sltHandleItemHoverChange);
-    }
 }
 

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

@@ -132 +132 @@
         /** Returns whether we should show item names. */
         bool showItemNames() const;
-
-        /** Returns whether at least one item hovered. */
-        bool isAtLeastOneItemHovered() const;
     /** @} */
 
@@ -191 +188 @@
 
 private slots:
-
-    /** @name Children stuff.
-      * @{ */
-       /** Handles signal about one of items was [un]hovered. */
-       void sltHandleItemHoverChange();
-    /** @} */
 
     /** @name Selection stuff.