Changeset 74596 in vbox for trunk/src

Timestamp:

Oct 3, 2018 2:25:09 PM (6 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:9241: macOS: VirtualBox Manager: Sync global chooser item palette with main tool-bar palette.

Location:

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

Files:

• UIVirtualBoxManagerWidget.cpp (modified) (1 diff)
• chooser/UIChooserItemGlobal.cpp (modified) (7 diffs)
• chooser/UIChooserItemGlobal.h (modified) (1 diff)

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

@@ -441 +441 @@
                         m_pToolBar->setContextMenuPolicy(Qt::CustomContextMenu);
                         m_pToolBar->setToolButtonStyle(Qt::ToolButtonTextUnderIcon);
+#ifdef VBOX_WS_MAC
+                        m_pToolBar->emulateMacToolbar();
+#endif
 
                         /* Add tool-bar into layout: */

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

@@ -43 +43 @@
                                          int iPosition /* = -1 */)
     : UIChooserItem(pParent, pParent->isTemporary())
-    , m_iHoverLightness(0)
-    , m_iHighlightLightness(0)
-    , m_iHoverHighlightLightness(0)
+    , m_iDefaultLightnessMin(0)
+    , m_iDefaultLightnessMax(0)
+    , m_iHoverLightnessMin(0)
+    , m_iHoverLightnessMax(0)
+    , m_iHighlightLightnessMin(0)
+    , m_iHighlightLightnessMax(0)
     , m_iMinimumNameWidth(0)
     , m_iMaximumNameWidth(0)
@@ -73 +76 @@
                                          int iPosition /* = -1 */)
     : UIChooserItem(pParent, pParent->isTemporary())
-    , m_iHoverLightness(0)
-    , m_iHighlightLightness(0)
-    , m_iHoverHighlightLightness(0)
+    , m_iDefaultLightnessMin(0)
+    , m_iDefaultLightnessMax(0)
+    , m_iHoverLightnessMin(0)
+    , m_iHoverLightnessMax(0)
+    , m_iHighlightLightnessMin(0)
+    , m_iHighlightLightnessMax(0)
     , m_iMinimumNameWidth(0)
     , m_iMaximumNameWidth(0)
@@ -416 +422 @@
     /* Colors: */
 #ifdef VBOX_WS_MAC
-    m_iHighlightLightness = 115;
-    m_iHoverLightness = 110;
-    m_iHoverHighlightLightness = 120;
+    m_iHighlightLightnessMin = 105;
+    m_iHighlightLightnessMax = 115;
+    m_iHoverLightnessMin = 115;
+    m_iHoverLightnessMax = 125;
+    m_iDefaultLightnessMin = 125;
+    m_iDefaultLightnessMax = 130;
 #else /* VBOX_WS_MAC */
-    m_iHighlightLightness = 130;
-    m_iHoverLightness = 155;
-    m_iHoverHighlightLightness = 175;
+    m_iHighlightLightnessMin = 130;
+    m_iHighlightLightnessMax = 160;
+    m_iHoverLightnessMin = 160;
+    m_iHoverLightnessMax = 190;
+    m_iDefaultLightnessMin = 160;
+    m_iDefaultLightnessMax = 190;
 #endif /* !VBOX_WS_MAC */
 
@@ -576 +588 @@
     {
         /* Prepare color: */
-        QColor highlight = pal.color(QPalette::Active, QPalette::Highlight);
+        QColor backgroundColor = pal.color(QPalette::Active, QPalette::Highlight);
         /* Draw gradient: */
         QLinearGradient bgGrad(rectangle.topLeft(), rectangle.bottomLeft());
-        bgGrad.setColorAt(0, highlight.lighter(m_iHighlightLightness));
-        bgGrad.setColorAt(1, highlight);
+        bgGrad.setColorAt(0, backgroundColor.lighter(m_iHighlightLightnessMax));
+        bgGrad.setColorAt(1, backgroundColor.lighter(m_iHighlightLightnessMin));
         pPainter->fillRect(rectangle, bgGrad);
     }
@@ -587 +599 @@
     {
         /* Prepare color: */
-        QColor highlight = pal.color(QPalette::Active, QPalette::Highlight);
+        QColor backgroundColor = pal.color(QPalette::Active, QPalette::Highlight);
         /* Draw gradient: */
         QLinearGradient bgGrad(rectangle.topLeft(), rectangle.bottomLeft());
-        bgGrad.setColorAt(0, highlight.lighter(m_iHoverHighlightLightness));
-        bgGrad.setColorAt(1, highlight.lighter(m_iHoverLightness));
+        bgGrad.setColorAt(0, backgroundColor.lighter(m_iHoverLightnessMax));
+        bgGrad.setColorAt(1, backgroundColor.lighter(m_iHoverLightnessMin));
         pPainter->fillRect(rectangle, bgGrad);
+    }
+    /* Default background: */
+    else
+    {
+#ifdef VBOX_WS_MAC
+        /* Prepare color: */
+        QColor backgroundColor = pal.color(QPalette::Active, QPalette::Mid);
+        /* Draw gradient: */
+        QLinearGradient bgGrad(rectangle.topLeft(), rectangle.bottomLeft());
+        bgGrad.setColorAt(0, backgroundColor.lighter(m_iDefaultLightnessMax));
+        bgGrad.setColorAt(1, backgroundColor.lighter(m_iDefaultLightnessMin));
+        pPainter->fillRect(rectangle, bgGrad);
+#else
+        /* Prepare color: */
+        QColor backgroundColor = pal.color(QPalette::Active, QPalette::Mid);
+        /* Draw gradient: */
+        QLinearGradient bgGrad(rectangle.topLeft(), rectangle.bottomLeft());
+        bgGrad.setColorAt(0, backgroundColor.lighter(m_iDefaultLightnessMax));
+        bgGrad.setColorAt(1, backgroundColor.lighter(m_iDefaultLightnessMin));
+        pPainter->fillRect(rectangle, bgGrad);
+#endif
     }
 
@@ -619 +652 @@
     pPainter->setPen(pen);
 
-    /* Draw rectangle: */
-    pPainter->drawRect(rectangle);
+    /* Draw borders: */
+    pPainter->drawLine(rectangle.topLeft(),    rectangle.topRight()    + QPoint(1, 0));
+    pPainter->drawLine(rectangle.bottomLeft(), rectangle.bottomRight() + QPoint(1, 0));
+    pPainter->drawLine(rectangle.topLeft(),    rectangle.bottomLeft());
 
     /* Restore painter: */
@@ -647 +682 @@
         const QPalette pal = palette();
         const QColor highlight = pal.color(QPalette::Active, QPalette::Highlight);
-        const QColor hhl = highlight.lighter(m_iHoverHighlightLightness);
+        const QColor hhl = highlight.lighter(m_iHoverLightnessMax);
         if (hhl.value() - hhl.saturation() > 0)
             pPainter->setPen(pal.color(QPalette::Active, QPalette::Text));

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

@@ -226 +226 @@
     /** @name Item stuff.
       * @{ */
-        /** Holds item hover lightness. */
-        int  m_iHoverLightness;
-        /** Holds item highlight lightness. */
-        int  m_iHighlightLightness;
-        /** Holds item hover highlight lightness. */
-        int  m_iHoverHighlightLightness;
+        /** Holds item minimum default lightness. */
+        int  m_iDefaultLightnessMin;
+        /** Holds item maximum default lightness. */
+        int  m_iDefaultLightnessMax;
+        /** Holds item minimum hover lightness. */
+        int  m_iHoverLightnessMin;
+        /** Holds item maximum hover lightness. */
+        int  m_iHoverLightnessMax;
+        /** Holds item minimum highlight lightness. */
+        int  m_iHighlightLightnessMin;
+        /** Holds item maximum highlight lightness. */
+        int  m_iHighlightLightnessMax;
 
         /** Holds item pixmap. */