Changeset 73989 in vbox for trunk/src

Timestamp:

Aug 31, 2018 9:46:25 AM (6 years ago)

Author:

vboxsync

Message:

FE/Qt: VirtualBox Manager UI: Chooser pane re-styling: Machine item: More strict/configurable color tones for hovered/selected item.

Location:

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

Files:

• UIChooserItemMachine.cpp (modified) (6 diffs)
• UIChooserItemMachine.h (modified) (1 diff)

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

@@ -47 +47 @@
     : UIChooserItem(pParent, pParent->isTemporary())
     , UIVirtualMachineItem(machine)
-    , m_iHoverLightness(0)
-    , m_iHighlightLightness(0)
-    , m_iHoverHighlightLightness(0)
+    , m_iHoverLightnessMin(0)
+    , m_iHoverLightnessMax(0)
+    , m_iHighlightLightnessMin(0)
+    , m_iHighlightLightnessMax(0)
     , m_iFirstRowMaximumWidth(0)
     , m_iMinimumNameWidth(0)
@@ -82 +83 @@
     : UIChooserItem(pParent, pParent->isTemporary())
     , UIVirtualMachineItem(pCopyFrom->machine())
-    , m_iHoverLightness(0)
-    , m_iHighlightLightness(0)
-    , m_iHoverHighlightLightness(0)
+    , m_iHoverLightnessMin(0)
+    , m_iHoverLightnessMax(0)
+    , m_iHighlightLightnessMin(0)
+    , m_iHighlightLightnessMax(0)
     , m_iFirstRowMaximumWidth(0)
     , m_iMinimumNameWidth(0)
@@ -585 +587 @@
     /* Colors: */
 #ifdef VBOX_WS_MAC
-    m_iHighlightLightness = 115;
-    m_iHoverLightness = 110;
-    m_iHoverHighlightLightness = 120;
+    m_iHighlightLightnessMin = 105;
+    m_iHighlightLightnessMax = 115;
+    m_iHoverLightnessMin = 110;
+    m_iHoverLightnessMax = 120;
 #else /* VBOX_WS_MAC */
-    m_iHighlightLightness = 130;
-    m_iHoverLightness = 155;
-    m_iHoverHighlightLightness = 175;
+    m_iHighlightLightnessMin = 120;
+    m_iHighlightLightnessMax = 160;
+    m_iHoverLightnessMin = 155;
+    m_iHoverLightnessMax = 175;
 #endif /* !VBOX_WS_MAC */
 
@@ -909 +913 @@
         /* Draw gradient: */
         QLinearGradient bgGrad(rect.topLeft(), rect.bottomLeft());
-        bgGrad.setColorAt(0, highlight.lighter(m_iHighlightLightness));
-        bgGrad.setColorAt(1, highlight);
+        bgGrad.setColorAt(0, highlight.lighter(m_iHighlightLightnessMax));
+        bgGrad.setColorAt(1, highlight.lighter(m_iHighlightLightnessMin));
         pPainter->fillRect(rect, bgGrad);
     }
@@ -920 +924 @@
         /* Draw gradient: */
         QLinearGradient bgGrad(rect.topLeft(), rect.bottomLeft());
-        bgGrad.setColorAt(0, highlight.lighter(m_iHoverHighlightLightness));
-        bgGrad.setColorAt(1, highlight.lighter(m_iHoverLightness));
+        bgGrad.setColorAt(0, highlight.lighter(m_iHoverLightnessMax));
+        bgGrad.setColorAt(1, highlight.lighter(m_iHoverLightnessMin));
         pPainter->fillRect(rect, bgGrad);
     }
@@ -993 +997 @@
         QPalette pal = palette();
         QColor highlight = pal.color(QPalette::Active, QPalette::Highlight);
-        QColor hhl = highlight.lighter(m_iHoverHighlightLightness);
+        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/UIChooserItemMachine.h

@@ -265 +265 @@
     /** @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 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. */