Changeset 74318 in vbox for trunk/src/VBox/Frontends/VirtualBox

Timestamp:

Sep 17, 2018 4:19:38 PM (6 years ago)

Author:

vboxsync

Message:

FE/Qt: VirtualBox Manager: Background/foreground fixes for disabled items.

File:

• trunk/src/VBox/Frontends/VirtualBox/src/manager/tools/UIToolsItem.cpp (modified) (6 diffs)

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

@@ -695 +695 @@
     pPainter->save();
 
-    /* Prepare color: */
+    /* Prepare variables: */
     const QPalette pal = palette();
 
@@ -702 +702 @@
     {
         /* Prepare color: */
-        const QColor highlight = pal.color(QPalette::Active, QPalette::Highlight);
+        const QColor backgroundColor = isEnabled()
+                                     ? pal.color(QPalette::Active, QPalette::Highlight)
+                                     : pal.color(QPalette::Disabled, QPalette::Midlight);
         /* Draw gradient: */
         QLinearGradient bgGrad(rectangle.topLeft(), rectangle.bottomLeft());
-        bgGrad.setColorAt(0, highlight.lighter(m_iHighlightLightnessMax));
-        bgGrad.setColorAt(1, highlight.lighter(m_iHighlightLightnessMin));
+        bgGrad.setColorAt(0, backgroundColor.lighter(m_iHighlightLightnessMax));
+        bgGrad.setColorAt(1, backgroundColor.lighter(m_iHighlightLightnessMin));
         pPainter->fillRect(rectangle, bgGrad);
     }
@@ -713 +715 @@
     {
         /* Prepare color: */
-        const QColor highlight = pal.color(QPalette::Active, QPalette::Highlight);
+        const QColor backgroundColor = isEnabled()
+                                     ? pal.color(QPalette::Active, QPalette::Highlight)
+                                     : pal.color(QPalette::Disabled, QPalette::Midlight);
         /* Draw gradient: */
         QLinearGradient bgGrad(rectangle.topLeft(), rectangle.bottomLeft());
-        bgGrad.setColorAt(0, highlight.lighter(m_iHoverLightnessMax));
-        bgGrad.setColorAt(1, highlight.lighter(m_iHoverLightnessMin));
+        bgGrad.setColorAt(0, backgroundColor.lighter(m_iHoverLightnessMax));
+        bgGrad.setColorAt(1, backgroundColor.lighter(m_iHoverLightnessMin));
         pPainter->fillRect(rectangle, bgGrad);
     }
@@ -724 +728 @@
     {
         /* Prepare color: */
-        const QColor usual = pal.color(QPalette::Active, QPalette::Mid);
+        const QColor backgroundColor = isEnabled()
+                                     ? pal.color(QPalette::Active, QPalette::Mid)
+                                     : pal.color(QPalette::Disabled, QPalette::Midlight);
         /* Draw gradient: */
         QLinearGradient bgGrad(rectangle.topLeft(), rectangle.bottomLeft());
-        bgGrad.setColorAt(0, usual.lighter(m_iHoverLightnessMax));
-        bgGrad.setColorAt(1, usual.lighter(m_iHoverLightnessMin));
+        bgGrad.setColorAt(0, backgroundColor.lighter(m_iHoverLightnessMax));
+        bgGrad.setColorAt(1, backgroundColor.lighter(m_iHoverLightnessMin));
         pPainter->fillRect(rectangle, bgGrad);
     }
@@ -769 +775 @@
     const int iMargin = data(ToolsItemData_Margin).toInt();
     const int iSpacing = data(ToolsItemData_Spacing).toInt();
+    const QPalette pal = palette();
 
     /* Selected item foreground: */
     if (model()->currentItem() == this)
     {
-        QPalette pal = palette();
-        pPainter->setPen(pal.color(QPalette::HighlightedText));
+        const QColor textColor = isEnabled()
+                               ? pal.color(QPalette::Active, QPalette::HighlightedText)
+                               : pal.color(QPalette::Disabled, QPalette::Text);
+        pPainter->setPen(textColor);
     }
     /* Hovered item foreground: */
@@ -780 +789 @@
     {
         /* 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));
+        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);
         else
-            pPainter->setPen(pal.color(QPalette::Active, QPalette::HighlightedText));
+            textColor = isEnabled()
+                      ? pal.color(QPalette::Active, QPalette::HighlightedText)
+                      : pal.color(QPalette::Disabled, QPalette::Text);
+        pPainter->setPen(textColor);
+    }
+    /* Default item foreground: */
+    else
+    {
+        const QColor textColor = isEnabled()
+                               ? pal.color(QPalette::Active, QPalette::Text)
+                               : pal.color(QPalette::Disabled, QPalette::Text);
+        pPainter->setPen(textColor);
     }