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

Timestamp:

May 24, 2021 3:14:21 PM (4 years ago)

Author:

vboxsync

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

144585

Message:

FE/Qt: bugref:10003: Update related to Chooser and Tool panes rework introduced in r144189 and directed to let items have native highlight foreground color depending on background luminance; A bit of fallback colors for foreground color calculation algorithm.

Location:

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

Files:

• chooser/UIChooserItemGlobal.cpp (modified) (1 diff)
• chooser/UIChooserItemGroup.cpp (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

@@ -711 +711 @@
         const QColor simpleText = pal.color(QPalette::Active, QPalette::Text);
         const QColor highlightText = pal.color(QPalette::Active, QPalette::HighlightedText);
-        const QColor lightText = simpleText.black() < highlightText.black() ? simpleText : highlightText;
-        const QColor darkText = simpleText.black() > highlightText.black() ? simpleText : highlightText;
+        QColor lightText = simpleText.black() < highlightText.black() ? simpleText : highlightText;
+        QColor darkText = simpleText.black() > highlightText.black() ? simpleText : highlightText;
+        if (lightText.black() > 128)
+            lightText = QColor(Qt::white);
+        if (darkText.black() < 128)
+            darkText = QColor(Qt::black);
 
         /* Gather foreground color for background one: */

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

@@ -1738 +1738 @@
         const QColor simpleText = pal.color(QPalette::Active, QPalette::Text);
         const QColor highlightText = pal.color(QPalette::Active, QPalette::HighlightedText);
-        const QColor lightText = simpleText.black() < highlightText.black() ? simpleText : highlightText;
-        const QColor darkText = simpleText.black() > highlightText.black() ? simpleText : highlightText;
+        QColor lightText = simpleText.black() < highlightText.black() ? simpleText : highlightText;
+        QColor darkText = simpleText.black() > highlightText.black() ? simpleText : highlightText;
+        if (lightText.black() > 128)
+            lightText = QColor(Qt::white);
+        if (darkText.black() < 128)
+            darkText = QColor(Qt::black);
 
         /* Gather foreground color for background one: */

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

@@ -1095 +1095 @@
         const QColor simpleText = pal.color(QPalette::Active, QPalette::Text);
         const QColor highlightText = pal.color(QPalette::Active, QPalette::HighlightedText);
-        const QColor lightText = simpleText.black() < highlightText.black() ? simpleText : highlightText;
-        const QColor darkText = simpleText.black() > highlightText.black() ? simpleText : highlightText;
+        QColor lightText = simpleText.black() < highlightText.black() ? simpleText : highlightText;
+        QColor darkText = simpleText.black() > highlightText.black() ? simpleText : highlightText;
+        if (lightText.black() > 128)
+            lightText = QColor(Qt::white);
+        if (darkText.black() < 128)
+            darkText = QColor(Qt::black);
 
         /* Gather foreground color for background one: */

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

@@ -868 +868 @@
         const QColor simpleText = pal.color(QPalette::Active, QPalette::Text);
         const QColor highlightText = pal.color(QPalette::Active, QPalette::HighlightedText);
-        const QColor lightText = simpleText.black() < highlightText.black() ? simpleText : highlightText;
-        const QColor darkText = simpleText.black() > highlightText.black() ? simpleText : highlightText;
+        QColor lightText = simpleText.black() < highlightText.black() ? simpleText : highlightText;
+        QColor darkText = simpleText.black() > highlightText.black() ? simpleText : highlightText;
+        if (lightText.black() > 128)
+            lightText = QColor(Qt::white);
+        if (darkText.black() < 128)
+            darkText = QColor(Qt::black);
 
         /* Gather foreground color for background one: */