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

Timestamp:

May 24, 2021 5:10:53 PM (4 years ago)

Author:

vboxsync

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

144596

Message:

FE/Qt: bugref:10003: Reworking Chooser and Tool panes hovered/highlighted colors to be more native, especially on Windows.

Location:

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

Files:

• chooser/UIChooserItemGlobal.cpp (modified) (1 diff)
• chooser/UIChooserItemGroup.cpp (modified) (6 diffs)
• chooser/UIChooserItemGroup.h (modified) (1 diff)
• chooser/UIChooserItemMachine.cpp (modified) (1 diff)
• tools/UIToolsItem.cpp (modified) (1 diff)

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

@@ -338 +338 @@
     m_iHighlightLightnessFinal = 105;
 #elif defined(VBOX_WS_WIN)
-    m_iHoverLightnessStart = 190;
-    m_iHoverLightnessFinal = 160;
-    m_iHighlightLightnessStart = 160;
-    m_iHighlightLightnessFinal = 130;
+    m_iHoverLightnessStart = 220;
+    m_iHoverLightnessFinal = 210;
+    m_iHighlightLightnessStart = 190;
+    m_iHighlightLightnessFinal = 180;
 #else /* !VBOX_WS_MAC && !VBOX_WS_WIN */
-    m_iHoverLightnessStart = 190;
-    m_iHoverLightnessFinal = 160;
-    m_iHighlightLightnessStart = 160;
-    m_iHighlightLightnessFinal = 130;
+    m_iHoverLightnessStart = 125;
+    m_iHoverLightnessFinal = 115;
+    m_iHighlightLightnessStart = 110;
+    m_iHighlightLightnessFinal = 100;
 #endif /* !VBOX_WS_MAC && !VBOX_WS_WIN */
 

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

@@ -52 +52 @@
     , m_iItemBackgroundDarknessStart(0)
     , m_iItemBackgroundDarknessFinal(0)
+    , m_iHighlightLightness(0)
     , m_iAdditionalHeight(0)
     , m_pToggleButton(0)
@@ -75 +76 @@
     , m_iItemBackgroundDarknessStart(0)
     , m_iItemBackgroundDarknessFinal(0)
+    , m_iHighlightLightness(0)
     , m_iAdditionalHeight(0)
     , m_pToggleButton(0)
@@ -1052 +1054 @@
     m_iItemBackgroundDarknessStart = 100;
     m_iItemBackgroundDarknessFinal = 105;
+#if defined(VBOX_WS_MAC)
+    m_iHighlightLightness = 105;
+#elif defined(VBOX_WS_WIN)
+    m_iHighlightLightness = 190;
+#else /* !VBOX_WS_MAC && !VBOX_WS_WIN */
+    m_iHighlightLightness = 105;
+#endif /* !VBOX_WS_MAC && !VBOX_WS_WIN */
 
     /* Prepare self: */
@@ -1616 +1625 @@
         /* Acquire background color: */
         const QColor backgroundColor = model()->selectedItems().contains(this)
-                                     ? QApplication::palette().color(QPalette::Active, QPalette::Highlight)
+                                     ? QApplication::palette().color(QPalette::Active, QPalette::Highlight).lighter(m_iHighlightLightness)
                                      : QApplication::palette().color(QPalette::Active, QPalette::Window);
 
@@ -1694 +1703 @@
 
     /* Prepare color: */
-    const QColor frameColor = QApplication::palette().color(QPalette::Active, QPalette::Highlight).darker(110);
+    const QColor frameColor = QApplication::palette().color(QPalette::Active, QPalette::Highlight).lighter(m_iHighlightLightness - 40);
 
     /* Create/assign pen: */
@@ -1738 +1747 @@
 
         /* Get background color: */
-        const QColor background = pal.color(QPalette::Active, QPalette::Highlight);
+        const QColor background = pal.color(QPalette::Active, QPalette::Highlight).lighter(m_iHighlightLightness);
 
         /* Get foreground color: */

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

@@ -329 +329 @@
         /** Holds item final background darkness. */
         int  m_iItemBackgroundDarknessFinal;
+        /** Holds item header highlight lightness. */
+        int  m_iHighlightLightness;
 
         /** Holds aditional height. */

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

@@ -555 +555 @@
     m_iDefaultLightnessStart = 120;
     m_iDefaultLightnessFinal = 110;
-    m_iHoverLightnessStart = 190;
-    m_iHoverLightnessFinal = 160;
-    m_iHighlightLightnessStart = 160;
-    m_iHighlightLightnessFinal = 130;
+    m_iHoverLightnessStart = 220;
+    m_iHoverLightnessFinal = 210;
+    m_iHighlightLightnessStart = 190;
+    m_iHighlightLightnessFinal = 180;
 #else /* !VBOX_WS_MAC && !VBOX_WS_WIN */
     m_iDefaultLightnessStart = 110;
     m_iDefaultLightnessFinal = 100;
-    m_iHoverLightnessStart = 190;
-    m_iHoverLightnessFinal = 160;
-    m_iHighlightLightnessStart = 160;
-    m_iHighlightLightnessFinal = 130;
+    m_iHoverLightnessStart = 125;
+    m_iHoverLightnessFinal = 115;
+    m_iHighlightLightnessStart = 110;
+    m_iHighlightLightnessFinal = 100;
 #endif /* !VBOX_WS_MAC && !VBOX_WS_WIN */
 

trunk/src/VBox/Frontends/VirtualBox/src/manager/tools/UIToolsItem.cpp

@@ -447 +447 @@
     m_iHoverLightnessStart = 125;
     m_iHoverLightnessFinal = 115;
-    m_iHighlightLightnessStart = 155;
-    m_iHighlightLightnessFinal = 145;
+    m_iHighlightLightnessStart = 115;
+    m_iHighlightLightnessFinal = 105;
 #elif defined(VBOX_WS_WIN)
     m_iDefaultLightnessStart = 120;
     m_iDefaultLightnessFinal = 110;
-    m_iHoverLightnessStart = 190;
-    m_iHoverLightnessFinal = 160;
-    m_iHighlightLightnessStart = 160;
-    m_iHighlightLightnessFinal = 130;
+    m_iHoverLightnessStart = 220;
+    m_iHoverLightnessFinal = 210;
+    m_iHighlightLightnessStart = 190;
+    m_iHighlightLightnessFinal = 180;
 #else /* !VBOX_WS_MAC && !VBOX_WS_WIN */
     m_iDefaultLightnessStart = 110;
     m_iDefaultLightnessFinal = 100;
-    m_iHoverLightnessStart = 190;
-    m_iHoverLightnessFinal = 160;
-    m_iHighlightLightnessStart = 160;
-    m_iHighlightLightnessFinal = 130;
+    m_iHoverLightnessStart = 125;
+    m_iHoverLightnessFinal = 115;
+    m_iHighlightLightnessStart = 110;
+    m_iHighlightLightnessFinal = 100;
 #endif /* !VBOX_WS_MAC && !VBOX_WS_WIN */