Changeset 108311 in vbox

Timestamp:

Feb 20, 2025 1:29:09 PM (3 weeks ago)

Author:

vboxsync

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

167655

Message:

FE/Qt: bugref:10814: VBox Manager / Tools pane: Hovered and Selected tokens for Machine tools in widget mode.

File:

• trunk/src/VBox/Frontends/VirtualBox/src/manager/tools/UIToolsItem.cpp (modified) (3 diffs)

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

@@ -747 +747 @@
                                          : highlightColor.darker(110);
 
-            /* Prepare token sub-rect: */
-            QRect tokenRect(rectangle.topLeft() + QPoint(0, 4),
-                            QSize(5, rectangle.height() - 8));
-
-            /* Draw gradient token: */
-            QLinearGradient hlGrad(tokenRect.topLeft(), tokenRect.bottomLeft());
-            hlGrad.setColorAt(0, highlightColor1);
-            hlGrad.setColorAt(1, highlightColor2);
-            pPainter->fillRect(tokenRect, hlGrad);
+            /* Depending on item class: */
+            switch (itemClass())
+            {
+                case UIToolClass_Global:
+                {
+                    /* Prepare token sub-rect: */
+                    QRect tokenRect(rectangle.topLeft() + QPoint(0, 4),
+                                    QSize(5, rectangle.height() - 8));
+
+                    /* Draw gradient token: */
+                    QLinearGradient hlGrad(tokenRect.topLeft(), tokenRect.bottomLeft());
+                    hlGrad.setColorAt(0, highlightColor1);
+                    hlGrad.setColorAt(1, highlightColor2);
+                    pPainter->fillRect(tokenRect, hlGrad);
+                    break;
+                }
+                case UIToolClass_Machine:
+                {
+                    /* A bit of indentation for Machine tools in widget mode: */
+                    int iIndent = QApplication::style()->pixelMetric(QStyle::PM_SmallIconSize) * .5;
+
+                    /* Prepare token sub-rect: */
+                    QRect tokenRect(rectangle.topLeft() + QPoint(iIndent, rectangle.height() / 2 - 2),
+                                    QSize(5, 5));
+
+                    /* Restrict painter path: */
+                    pPainter->save();
+                    QPainterPath path;
+                    path.addEllipse(tokenRect);
+                    pPainter->setClipPath(path);
+
+                    /* Draw gradient token: */
+                    QLinearGradient hlGrad(tokenRect.topLeft(), tokenRect.bottomLeft());
+                    hlGrad.setColorAt(0, highlightColor1);
+                    hlGrad.setColorAt(1, highlightColor2);
+                    pPainter->fillRect(tokenRect, hlGrad);
+                    pPainter->restore();
+                    break;
+                }
+                default:
+                    break;
+            }
         }
 
@@ -779 +812 @@
 #endif /* !VBOX_WS_MAC */
 
+            /* A bit of indentation for Machine tools in widget mode: */
+            const int iIndent = itemClass() == UIToolClass_Machine
+                              ? QApplication::style()->pixelMetric(QStyle::PM_SmallIconSize) * .5 : 0;
+
             /* Prepare icon sub-rect: */
             QRect subRect;
@@ -784 +821 @@
             subRect.setWidth(subRect.height());
 #ifdef VBOX_WS_MAC
-            subRect.moveTopLeft(rectangle.topLeft() + QPoint(2 * iMargin - iPadding, iMargin - iPadding));
+            subRect.moveTopLeft(rectangle.topLeft() + QPoint(iIndent + 2 * iMargin - iPadding, iMargin - iPadding));
 #else
-            subRect.moveTopLeft(rectangle.topLeft() + QPoint(1.5 * iMargin - iPadding, iMargin - iPadding));
+            subRect.moveTopLeft(rectangle.topLeft() + QPoint(iIndent + 1.5 * iMargin - iPadding, iMargin - iPadding));
 #endif