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

Timestamp:

Feb 6, 2025 5:20:30 PM (3 months ago)

Author:

vboxsync

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

167404

Message:

FE/Qt: bugref:10814: VBox Manager / Tools pane: Adjusting widget mode colors for item frame and extra button on non-macOS hosts.

Location:

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

Files:

• UIToolsItem.cpp (modified) (7 diffs)
• UIToolsItem.h (modified) (1 diff)

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

@@ -748 +748 @@
             pPainter->setRenderHint(QPainter::Antialiasing, true);
             /* Acquire background color: */
-            const QColor backgroundColor = pal.color(QPalette::Window);
+#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 icon sub-rect: */
@@ -759 +768 @@
             QPainterPath painterPath;
             painterPath.addRoundedRect(subRect, 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));
@@ -767 +782 @@
             /* Fill icon 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(subRect, backgroundColor2);
         }
@@ -896 +917 @@
     /* Acquire background color: */
     const QPalette pal = QApplication::palette();
-    QColor backgroundColor = pal.color(QPalette::Window);
+#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: */
@@ -907 +937 @@
     QPainterPath painterPath;
     painterPath.addRoundedRect(m_extraButtonRect, iPadding, iPadding);
-    QColor backgroundColor1 = uiCommon().isInDarkMode()
-                            ? backgroundColor.lighter(220)
-                            : backgroundColor.darker(140);
+#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));
@@ -915 +951 @@
     /* Fill button body: */
     pPainter->setClipPath(painterPath);
-    QColor backgroundColor2 = uiCommon().isInDarkMode()
-                            ? backgroundColor.lighter(160)
-                            : backgroundColor.darker(120);
+#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);
 
@@ -969 +1011 @@
     pPainter->restore();
 }
+
+#ifndef VBOX_WS_MAC
+/* static */
+int UIToolsItem::iShift30(int i1, int i2)
+{
+    const int iMin = qMin(i1, i2);
+    const int iMax = qMax(i1, i2);
+    const int iDiff = iMax - iMin;
+    const int iDiff10 = iDiff * 0.3;
+
+    int iResult = 0;
+    if (i1 > i2)
+        iResult = i1 - iDiff10;
+    else
+        iResult = i1 + iDiff10;
+
+    return qMin(255, iResult);
+}
+#endif /* !VBOX_WS_MAC */

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

@@ -248 +248 @@
                               const QFont &font, QPaintDevice *pPaintDevice,
                               const QString &strText);
+
+#ifndef VBOX_WS_MAC
+        /** Returns a number shifter per 10% from @a i1 to @a i2. */
+        static int iShift30(int i1, int i2);
+#endif
     /** @} */