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

Timestamp:

May 24, 2021 2:12:13 PM (4 years ago)

Author:

vboxsync

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

144583

Message:

FE/Qt: bugref:10003: A bit of cleanup for Chooser pane color tones; This time, reordering start/final tones in proper order.

Location:

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

Files:

• UIChooserItemGlobal.cpp (modified) (4 diffs)
• UIChooserItemMachine.cpp (modified) (4 diffs)

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

@@ -329 +329 @@
     /* Color tones: */
 #ifdef VBOX_WS_MAC
-    m_iDefaultLightnessStart = 125;
-    m_iDefaultLightnessFinal = 130;
-    m_iHoverLightnessStart = 115;
-    m_iHoverLightnessFinal = 125;
-    m_iHighlightLightnessStart = 105;
-    m_iHighlightLightnessFinal = 115;
+    m_iDefaultLightnessStart = 130;
+    m_iDefaultLightnessFinal = 125;
+    m_iHoverLightnessStart = 125;
+    m_iHoverLightnessFinal = 115;
+    m_iHighlightLightnessStart = 115;
+    m_iHighlightLightnessFinal = 105;
 #else /* VBOX_WS_MAC */
-    m_iDefaultLightnessStart = 160;
-    m_iDefaultLightnessFinal = 190;
-    m_iHoverLightnessStart = 160;
-    m_iHoverLightnessFinal = 190;
-    m_iHighlightLightnessStart = 130;
-    m_iHighlightLightnessFinal = 160;
+    m_iDefaultLightnessStart = 190;
+    m_iDefaultLightnessFinal = 160;
+    m_iHoverLightnessStart = 190;
+    m_iHoverLightnessFinal = 160;
+    m_iHighlightLightnessStart = 160;
+    m_iHighlightLightnessFinal = 130;
 #endif /* !VBOX_WS_MAC */
 
@@ -565 +565 @@
         /* Draw gradient: */
         QLinearGradient bgGrad(rectangle.topLeft(), rectangle.bottomLeft());
-        bgGrad.setColorAt(0, backgroundColor.lighter(m_iHighlightLightnessFinal));
-        bgGrad.setColorAt(1, backgroundColor.lighter(m_iHighlightLightnessStart));
+        bgGrad.setColorAt(0, backgroundColor.lighter(m_iHighlightLightnessStart));
+        bgGrad.setColorAt(1, backgroundColor.lighter(m_iHighlightLightnessFinal));
         pPainter->fillRect(rectangle, bgGrad);
 
@@ -602 +602 @@
         /* Draw gradient: */
         QLinearGradient bgGrad(rectangle.topLeft(), rectangle.bottomLeft());
-        bgGrad.setColorAt(0, backgroundColor.lighter(m_iHoverLightnessFinal));
-        bgGrad.setColorAt(1, backgroundColor.lighter(m_iHoverLightnessStart));
+        bgGrad.setColorAt(0, backgroundColor.lighter(m_iHoverLightnessStart));
+        bgGrad.setColorAt(1, backgroundColor.lighter(m_iHoverLightnessFinal));
         pPainter->fillRect(rectangle, bgGrad);
 
@@ -637 +637 @@
         /* Draw gradient: */
         QLinearGradient bgGrad(rectangle.topLeft(), rectangle.bottomLeft());
-        bgGrad.setColorAt(0, backgroundColor.lighter(m_iDefaultLightnessFinal));
-        bgGrad.setColorAt(1, backgroundColor.lighter(m_iDefaultLightnessStart));
+        bgGrad.setColorAt(0, backgroundColor.lighter(m_iDefaultLightnessStart));
+        bgGrad.setColorAt(1, backgroundColor.lighter(m_iDefaultLightnessFinal));
         pPainter->fillRect(rectangle, bgGrad);
 #else

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

@@ -546 +546 @@
     /* Color tones: */
 #ifdef VBOX_WS_MAC
-    m_iDefaultLightnessStart = 145;
-    m_iDefaultLightnessFinal = 155;
-    m_iHoverLightnessStart = 115;
-    m_iHoverLightnessFinal = 125;
-    m_iHighlightLightnessStart = 105;
-    m_iHighlightLightnessFinal = 115;
+    m_iDefaultLightnessStart = 155;
+    m_iDefaultLightnessFinal = 145;
+    m_iHoverLightnessStart = 125;
+    m_iHoverLightnessFinal = 115;
+    m_iHighlightLightnessStart = 115;
+    m_iHighlightLightnessFinal = 105;
 #else /* VBOX_WS_MAC */
-    m_iDefaultLightnessStart = 160;
-    m_iDefaultLightnessFinal = 190;
-    m_iHoverLightnessStart = 160;
-    m_iHoverLightnessFinal = 190;
-    m_iHighlightLightnessStart = 130;
-    m_iHighlightLightnessFinal = 160;
+    m_iDefaultLightnessStart = 190;
+    m_iDefaultLightnessFinal = 160;
+    m_iHoverLightnessStart = 190;
+    m_iHoverLightnessFinal = 160;
+    m_iHighlightLightnessStart = 160;
+    m_iHighlightLightnessFinal = 130;
 #endif /* !VBOX_WS_MAC */
 
@@ -909 +909 @@
         /* Draw gradient: */
         QLinearGradient bgGrad(rectangle.topLeft(), rectangle.bottomLeft());
-        bgGrad.setColorAt(0, backgroundColor.lighter(m_iHighlightLightnessFinal));
-        bgGrad.setColorAt(1, backgroundColor.lighter(m_iHighlightLightnessStart));
+        bgGrad.setColorAt(0, backgroundColor.lighter(m_iHighlightLightnessStart));
+        bgGrad.setColorAt(1, backgroundColor.lighter(m_iHighlightLightnessFinal));
         pPainter->fillRect(rectangle, bgGrad);
 
@@ -946 +946 @@
         /* Draw gradient: */
         QLinearGradient bgGrad(rectangle.topLeft(), rectangle.bottomLeft());
-        bgGrad.setColorAt(0, backgroundColor.lighter(m_iHoverLightnessFinal));
-        bgGrad.setColorAt(1, backgroundColor.lighter(m_iHoverLightnessStart));
+        bgGrad.setColorAt(0, backgroundColor.lighter(m_iHoverLightnessStart));
+        bgGrad.setColorAt(1, backgroundColor.lighter(m_iHoverLightnessFinal));
         pPainter->fillRect(rectangle, bgGrad);
 
@@ -980 +980 @@
         /* Draw gradient: */
         QLinearGradient bgGrad(rectangle.topLeft(), rectangle.bottomLeft());
-        bgGrad.setColorAt(0, backgroundColor.lighter(m_iDefaultLightnessFinal));
-        bgGrad.setColorAt(1, backgroundColor.lighter(m_iDefaultLightnessStart));
+        bgGrad.setColorAt(0, backgroundColor.lighter(m_iDefaultLightnessStart));
+        bgGrad.setColorAt(1, backgroundColor.lighter(m_iDefaultLightnessFinal));
         pPainter->fillRect(rectangle, bgGrad);
     }