Changeset 74685 in vbox for trunk/src/VBox

Timestamp:

Oct 8, 2018 3:31:17 PM (6 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:9241: VirtualBox Manager: Details pane: Adjusting color tones for macOS.

Location:

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

Files:

• UIVirtualBoxManagerWidget.cpp (modified) (1 diff)
• details/UIDetailsElement.cpp (modified) (4 diffs)
• details/UIDetailsElement.h (modified) (1 diff)
• details/UIDetailsGroup.cpp (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/src/manager/UIVirtualBoxManagerWidget.cpp

@@ -376 +376 @@
     setAutoFillBackground(true);
     QPalette pal = palette();
-    QColor color = pal.color(QPalette::Active, QPalette::Mid).lighter(155);
+#ifdef VBOX_WS_MAC
+    const QColor color = pal.color(QPalette::Active, QPalette::Mid).lighter(145);
+#else
+    const QColor color = pal.color(QPalette::Active, QPalette::Mid).lighter(155);
+#endif
     pal.setColor(QPalette::Window, color);
     setPalette(pal);

trunk/src/VBox/Frontends/VirtualBox/src/manager/details/UIDetailsElement.cpp

@@ -47 +47 @@
     , m_pSet(pParent)
     , m_enmType(enmType)
-    , m_iLightnessToneStart(155)
-    , m_iLightnessToneFinal(175)
+#ifdef VBOX_WS_MAC
+    , m_iDefaultToneStart(145)
+    , m_iDefaultToneFinal(155)
+    , m_iHoverToneStart(115)
+    , m_iHoverToneFinal(125)
+#else
+    , m_iDefaultToneStart(160)
+    , m_iDefaultToneFinal(190)
+    , m_iHoverToneStart(160)
+    , m_iHoverToneFinal(190)
+#endif
     , m_fHovered(false)
     , m_fNameHovered(false)
@@ -665 +674 @@
     /* Paint default background: */
     const QColor defaultColor = pal.color(QPalette::Active, QPalette::Mid);
-    const QColor dcTone1 = defaultColor.lighter(m_iLightnessToneFinal);
-    const QColor dcTone2 = defaultColor.lighter(m_iLightnessToneStart);
+    const QColor dcTone1 = defaultColor.lighter(m_iDefaultToneFinal);
+    const QColor dcTone2 = defaultColor.lighter(m_iDefaultToneStart);
     QLinearGradient gradientDefault(fullRect.topLeft(), fullRect.bottomLeft());
     gradientDefault.setColorAt(0, dcTone1);
@@ -677 +686 @@
         /* Paint hovered background: */
         const QColor hoveredColor = pal.color(QPalette::Active, QPalette::Highlight);
-        QColor hcTone1 = hoveredColor.lighter(m_iLightnessToneFinal);
-        QColor hcTone2 = hoveredColor.lighter(m_iLightnessToneStart);
+        QColor hcTone1 = hoveredColor.lighter(m_iHoverToneFinal);
+        QColor hcTone2 = hoveredColor.lighter(m_iHoverToneStart);
         hcTone1.setAlpha(m_iAnimatedValue);
         hcTone2.setAlpha(m_iAnimatedValue);
@@ -705 +714 @@
 
     /* Paint frame: */
-    const QColor frameColor = palette().color(QPalette::Active, QPalette::Mid);
-    pPainter->setPen(frameColor.lighter(m_iLightnessToneStart));
+    const QColor strokeColor = palette().color(QPalette::Active, QPalette::Mid).lighter(m_iDefaultToneStart);
+    QPen pen(strokeColor);
+    pen.setWidth(0);
+    pPainter->setPen(pen);
     pPainter->drawRect(fullRect);
 

trunk/src/VBox/Frontends/VirtualBox/src/manager/details/UIDetailsElement.h

@@ -307 +307 @@
         QFont  m_textFont;
 
-        /** Holds the start lightness tone. */
-        int m_iLightnessToneStart;
-        /** Holds the final lightness tone. */
-        int m_iLightnessToneFinal;
+        /** Holds the start default tone. */
+        int m_iDefaultToneStart;
+        /** Holds the final default tone. */
+        int m_iDefaultToneFinal;
+        /** Holds the start hover tone. */
+        int m_iHoverToneStart;
+        /** Holds the final hover tone. */
+        int m_iHoverToneFinal;
 
         /** Holds whether element is hovered. */

trunk/src/VBox/Frontends/VirtualBox/src/manager/details/UIDetailsGroup.cpp

@@ -317 +317 @@
 
     /* Paint default background: */
-    const QColor defaultColor = palette().color(QPalette::Active, QPalette::Midlight).darker(110);
+#ifdef VBOX_WS_MAC
+    const QColor defaultColor = palette().color(QPalette::Active, QPalette::Mid).lighter(145);
+#else
+    const QColor defaultColor = palette().color(QPalette::Active, QPalette::Mid).lighter(155);
+#endif
     pPainter->fillRect(optionRect, defaultColor);