Changeset 89138 in vbox

Timestamp:

May 18, 2021 12:48:07 PM (4 years ago)

Author:

vboxsync

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

144479

Message:

FE/Qt: bugref:10003: Reworking Chooser pane; Fixing quirks painting group item frame and gathering suitable foreground color.

File:

• trunk/src/VBox/Frontends/VirtualBox/src/manager/chooser/UIChooserItemGroup.cpp (modified) (3 diffs)

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

@@ -1656 +1656 @@
         return;
 
+    /* Only selected item should have a frame: */
+    if (!model()->selectedItems().contains(this))
+        return;
+
     /* Save painter: */
     pPainter->save();
@@ -1680 +1684 @@
 
     /* Draw borders: */
+    pPainter->drawLine(rectangle.topLeft(), rectangle.topRight());
     if (node()->hasNodes() && nodeToGroupType()->isOpened())
         pPainter->drawLine(topRect.bottomLeft() + QPoint(iParentIndent, 0), topRect.bottomRight() + QPoint(1, 0));
@@ -1703 +1708 @@
     const int iFullHeaderHeight = m_minimumHeaderSize.height();
 
-    /* Configure painter color: */
-    pPainter->setPen(QApplication::palette().color(QPalette::Active,
-                                                   model()->selectedItems().contains(this) ?
-                                                   QPalette::HighlightedText : QPalette::ButtonText));
+    /* Selected item foreground: */
+    if (model()->selectedItems().contains(this))
+    {
+        /* Prepare palette: */
+        const QPalette pal = QApplication::palette();
+
+        /* Get background color: */
+        const QColor background = pal.color(QPalette::Active, QPalette::Highlight).darker(headerDarkness());
+
+        /* 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(lightText);
+    }
 
     /* Paint name: */