Changeset 102423 in vbox

Timestamp:

Dec 1, 2023 2:23:43 PM (17 months ago)

Author:

vboxsync

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

160566

Message:

FE/Qt: macOS: Adjust cocoa native colors for QIToolBar and Chooser pane global item.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• extensions/QIToolBar.cpp (modified) (1 diff)
• manager/chooser/UIChooserItemGlobal.cpp (modified) (3 diffs)
• manager/chooser/UIChooserItemGlobal.h (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/src/extensions/QIToolBar.cpp

@@ -163 +163 @@
         const QColor backgroundColor = QApplication::palette().color(QPalette::Active, QPalette::Window);
         QLinearGradient gradient(rectangle.topLeft(), rectangle.bottomLeft());
+#if defined (VBOX_WS_MAC)
+        gradient.setColorAt(0, backgroundColor.lighter(105));
+        gradient.setColorAt(1, backgroundColor.darker(105));
+#else
         gradient.setColorAt(0, backgroundColor.darker(105));
         gradient.setColorAt(1, backgroundColor.darker(115));
+#endif
 
         /* Fill background: */

trunk/src/VBox/Frontends/VirtualBox/src/manager/chooser/UIChooserItemGlobal.cpp

@@ -45 +45 @@
     : UIChooserItem(pParent, pNode)
 #ifdef VBOX_WS_MAC
-    , m_iDefaultDarknessStart(0)
-    , m_iDefaultDarknessFinal(0)
+    , m_iDefaultColorDeviation(0)
 #endif
     , m_iHoverLightnessStart(0)
@@ -343 +342 @@
     /* Color tones: */
 #if defined(VBOX_WS_MAC)
-    m_iDefaultDarknessStart = 105;
-    m_iDefaultDarknessFinal = 115;
+    m_iDefaultColorDeviation = 105;
     m_iHoverLightnessStart = 125;
     m_iHoverLightnessFinal = 115;
@@ -662 +660 @@
         /* Draw gradient: */
         QLinearGradient bgGrad(rectangle.topLeft(), rectangle.bottomLeft());
-        bgGrad.setColorAt(0, backgroundColor.darker(m_iDefaultDarknessStart));
-        bgGrad.setColorAt(1, backgroundColor.darker(m_iDefaultDarknessFinal));
+        bgGrad.setColorAt(0, backgroundColor.lighter(m_iDefaultColorDeviation));
+        bgGrad.setColorAt(1, backgroundColor.darker(m_iDefaultColorDeviation));
         pPainter->fillRect(rectangle, bgGrad);
 #else

trunk/src/VBox/Frontends/VirtualBox/src/manager/chooser/UIChooserItemGlobal.h

@@ -231 +231 @@
 #ifdef VBOX_WS_MAC
         /** Holds item start default darkness. */
-        int  m_iDefaultDarknessStart;
-        /** Holds item final default darkness. */
-        int  m_iDefaultDarknessFinal;
+        int  m_iDefaultColorDeviation;
 #endif
         /** Holds item start hover lightness. */