Changeset 88855 in vbox for trunk/src/VBox

Timestamp:

May 4, 2021 1:49:27 PM (4 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:10003: Reworking Chooser pane and Tool pane items to have native highlight foreground depending on background luminance.

Location:

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

Files:

• chooser/UIChooserItemGlobal.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

@@ -702 +702 @@
     const int iButtonMargin = data(GlobalItemData_ButtonMargin).toInt();
 
-    /* Selected-item foreground: */
-    if (model()->selectedItems().contains(unconst(this)))
-    {
-        const QPalette pal = palette();
-        pPainter->setPen(pal.color(QPalette::HighlightedText));
-    }
-    /* Hovered item foreground: */
-    else if (isHovered())
-    {
-        /* Prepare color: */
-        const QPalette pal = palette();
+    /* Selected or hovered item foreground: */
+    if (model()->selectedItems().contains(unconst(this)) || isHovered())
+    {
+        /* Prepare palette: */
+        const QPalette pal = QApplication::palette();
+
+        /* Get background color: */
         const QColor highlight = pal.color(QPalette::Active, QPalette::Highlight);
-        const QColor hhl = highlight.lighter(m_iHoverLightnessMax);
-        if (hhl.value() - hhl.saturation() > 0)
-            pPainter->setPen(pal.color(QPalette::Active, QPalette::Text));
+        const QColor background = model()->selectedItems().contains(unconst(this))
+                                ? highlight.lighter(m_iHighlightLightnessMin)
+                                : highlight.lighter(m_iHoverLightnessMin);
+
+        /* Get foreground color: */
+        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;
+
+        /* Gather foreground color for background one: */
+        double dLuminance = (0.299 * background.red() + 0.587 * background.green() + 0.114 * background.blue()) / 255;
+        //printf("luminance = %f\n", dLuminance);
+        if (dLuminance > 0.5)
+            pPainter->setPen(darkText);
         else
-            pPainter->setPen(pal.color(QPalette::Active, QPalette::HighlightedText));
+            pPainter->setPen(lightText);
     }
 

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

@@ -1098 +1098 @@
     if (model()->selectedItems().contains(unconst(this)) || isHovered())
     {
-        /* Prepare color: */
-        QPalette pal = palette();
-        QColor highlight = pal.color(QPalette::Active, QPalette::Highlight);
-        QColor hhl = highlight.lighter(m_iHoverLightnessMax);
-        if (hhl.value() - hhl.saturation() > 0)
-            pPainter->setPen(pal.color(QPalette::Active, QPalette::Text));
+        /* Prepare palette: */
+        const QPalette pal = QApplication::palette();
+
+        /* Get background color: */
+        const QColor highlight = pal.color(QPalette::Active, QPalette::Highlight);
+        const QColor background = model()->selectedItems().contains(unconst(this))
+                                ? highlight.lighter(m_iHighlightLightnessMin)
+                                : highlight.lighter(m_iHoverLightnessMin);
+
+        /* Get foreground color: */
+        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;
+
+        /* Gather foreground color for background one: */
+        double dLuminance = (0.299 * background.red() + 0.587 * background.green() + 0.114 * background.blue()) / 255;
+        //printf("luminance = %f\n", dLuminance);
+        if (dLuminance > 0.5)
+            pPainter->setPen(darkText);
         else
-            pPainter->setPen(pal.color(QPalette::Active, QPalette::HighlightedText));
+            pPainter->setPen(lightText);
     }
 

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

@@ -853 +853 @@
     const QPalette pal = palette();
 
-    /* Selected item foreground: */
-    if (model()->currentItem() == this)
-    {
-        const QColor textColor = isEnabled()
-                               ? pal.color(QPalette::Active, QPalette::HighlightedText)
-                               : pal.color(QPalette::Disabled, QPalette::Text);
-        pPainter->setPen(textColor);
-    }
-    /* Hovered item foreground: */
-    else if (isHovered())
-    {
-        /* Prepare color: */
-        QColor defaultHighlighted = pal.color(QPalette::Active, QPalette::Highlight);
-        QColor hoveredHighlighted = defaultHighlighted.lighter(m_iHoverLightnessMax);
-        QColor textColor;
-        if (hoveredHighlighted.value() - hoveredHighlighted.saturation() > 0)
-            textColor = isEnabled()
-                      ? pal.color(QPalette::Active, QPalette::Text)
-                      : pal.color(QPalette::Disabled, QPalette::Text);
+    /* Selected or hovered item foreground: */
+    if (model()->currentItem() == this || isHovered())
+    {
+        /* Prepare palette: */
+        const QPalette pal = QApplication::palette();
+
+        /* Get background color: */
+        const QColor highlight = pal.color(QPalette::Active, QPalette::Highlight);
+        const QColor background = model()->currentItem() == this
+                                ? highlight.lighter(m_iHighlightLightnessMin)
+                                : highlight.lighter(m_iHoverLightnessMin);
+
+        /* Get foreground color: */
+        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;
+
+        /* Gather foreground color for background one: */
+        double dLuminance = (0.299 * background.red() + 0.587 * background.green() + 0.114 * background.blue()) / 255;
+        //printf("luminance = %f\n", dLuminance);
+        if (dLuminance > 0.5)
+            pPainter->setPen(darkText);
         else
-            textColor = isEnabled()
-                      ? pal.color(QPalette::Active, QPalette::HighlightedText)
-                      : pal.color(QPalette::Disabled, QPalette::Text);
-        pPainter->setPen(textColor);
+            pPainter->setPen(lightText);
     }
     /* Default item foreground: */