Changeset 89250 in vbox for trunk

Timestamp:

May 24, 2021 4:55:43 PM (4 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:10003: Reworking Details pane normal colors to be native; Hovered colors were removed.

Location:

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

Files:

• UIDetailsElement.cpp (modified) (3 diffs)
• UIDetailsElement.h (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/src/manager/details/UIDetailsElement.cpp

@@ -88 +88 @@
     , m_pSet(pParent)
     , m_enmType(enmType)
-#ifdef VBOX_WS_MAC
-    , m_iDefaultToneStart(145)
-    , m_iDefaultToneFinal(155)
-    , m_iHoverToneStart(115)
-    , m_iHoverToneFinal(125)
-#else
-    , m_iDefaultToneStart(160)
-    , m_iDefaultToneFinal(190)
-    , m_iHoverToneStart(160)
-    , m_iHoverToneFinal(190)
-#endif
+    , m_iDefaultDarknessStart(100)
+    , m_iDefaultDarknessFinal(105)
     , m_fHovered(false)
     , m_fNameHovered(false)
@@ -106 +97 @@
     , m_iAnimationDuration(300)
     , m_iDefaultValue(0)
-    , m_iHoveredValue(255)
+    , m_iHoveredValue(100)
     , m_iAnimatedValue(m_iDefaultValue)
     , m_pButton(0)
@@ -1465 +1456 @@
                          : optionRect;
 
-    /* Acquire palette: */
-    const QPalette pal = QApplication::palette();
+    /* Acquire background color: */
+    QColor backgroundColor = QApplication::palette().color(QPalette::Active, QPalette::Window);
 
     /* Paint default background: */
-    const QColor defaultColor = pal.color(QPalette::Active, QPalette::Mid);
-    const QColor dcTone1 = defaultColor.lighter(m_iDefaultToneFinal);
-    const QColor dcTone2 = defaultColor.lighter(m_iDefaultToneStart);
-    QLinearGradient gradientDefault(fullRect.topLeft(), fullRect.bottomLeft());
-    gradientDefault.setColorAt(0, dcTone1);
-    gradientDefault.setColorAt(1, dcTone2);
+    QLinearGradient gradientDefault(fullRect.topLeft(), fullRect.bottomRight());
+    gradientDefault.setColorAt(0, backgroundColor.darker(m_iDefaultDarknessStart));
+    gradientDefault.setColorAt(1, backgroundColor.darker(m_iDefaultDarknessFinal));
     pPainter->fillRect(fullRect, gradientDefault);
 
     /* If element is hovered: */
-    if (m_fHovered)
-    {
+    if (animatedValue())
+    {
+        /* Acquire header color: */
+        QColor headColor = backgroundColor.lighter(130);
+
         /* Paint hovered background: */
-        const QColor hoveredColor = pal.color(QPalette::Active, QPalette::Highlight);
-        QColor hcTone1 = hoveredColor.lighter(m_iHoverToneFinal);
-        QColor hcTone2 = hoveredColor.lighter(m_iHoverToneStart);
-        hcTone1.setAlpha(m_iAnimatedValue);
-        hcTone2.setAlpha(m_iAnimatedValue);
+        QColor hcTone1 = headColor;
+        QColor hcTone2 = headColor;
+        hcTone1.setAlpha(255 * animatedValue() / 100);
+        hcTone2.setAlpha(0);
         QLinearGradient gradientHovered(headRect.topLeft(), headRect.bottomLeft());
         gradientHovered.setColorAt(0, hcTone1);

trunk/src/VBox/Frontends/VirtualBox/src/manager/details/UIDetailsElement.h

@@ -351 +351 @@
         QFont  m_textFont;
 
-        /** Holds the start default tone. */
-        int m_iDefaultToneStart;
-        /** Holds the final default tone. */
-        int m_iDefaultToneFinal;
-        /** Holds the start hover tone. */
-        int m_iHoverToneStart;
-        /** Holds the final hover tone. */
-        int m_iHoverToneFinal;
+        /** Holds the start default darkness. */
+        int m_iDefaultDarknessStart;
+        /** Holds the final default darkness. */
+        int m_iDefaultDarknessFinal;
 
         /** Holds whether element is hovered. */