Changeset 74079 in vbox

Timestamp:

Sep 5, 2018 11:40:11 AM (6 years ago)

Author:

vboxsync

Message:

FE/Qt: VirtualBox Manager UI: Chooser pane re-styling: Group item: Hovering animation cleanup as well (s.a. r124840).

Location:

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

Files:

• UIChooserItemGroup.cpp (modified) (8 diffs)
• UIChooserItemGroup.h (modified) (2 diffs)

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

@@ -53 +53 @@
     , m_fClosed(false)
     , m_iAdditionalHeight(0)
-    , m_iCornerRadius(0)
-    , m_iBlackoutDarkness(0)
+    , m_iHeaderDarkness(110)
     , m_pToggleButton(0)
     , m_pEnterButton(0)
@@ -85 +84 @@
     , m_fClosed(pCopyFrom->isClosed())
     , m_iAdditionalHeight(0)
-    , m_iCornerRadius(0)
-    , m_iBlackoutDarkness(0)
+    , m_iHeaderDarkness(110)
     , m_strName(pCopyFrom->name())
     , m_pToggleButton(0)
@@ -121 +119 @@
     , m_fClosed(!fOpened)
     , m_iAdditionalHeight(0)
-    , m_iCornerRadius(0)
-    , m_iBlackoutDarkness(0)
+    , m_iHeaderDarkness(110)
     , m_strName(strName)
     , m_pToggleButton(0)
@@ -168 +165 @@
     , m_fClosed(pCopyFrom->isClosed())
     , m_iAdditionalHeight(0)
-    , m_iCornerRadius(0)
-    , m_iBlackoutDarkness(0)
+    , m_iHeaderDarkness(110)
     , m_strName(pCopyFrom->name())
     , m_pToggleButton(0)
@@ -1207 +1203 @@
 void UIChooserItemGroup::prepare()
 {
-    /* Buttons: */
-    m_pToggleButton = 0;
-    m_pEnterButton = 0;
-    m_pExitButton = 0;
-    /* Name editor: */
-    m_pNameEditorWidget = 0;
-    m_pNameEditor = 0;
     /* Painting stuff: */
-    m_iAdditionalHeight = 0;
-    m_iCornerRadius = 10;
-    m_iBlackoutDarkness = 110;
     m_nameFont = font();
     m_nameFont.setWeight(QFont::Bold);
@@ -1648 +1634 @@
                                    model()->currentItems().contains(this) ?
                                    QPalette::Highlight : QPalette::Midlight);
-    QColor bodyColor = pal.color(QPalette::Active, QPalette::Midlight).darker(blackoutDarkness());
+    QColor bodyColor = pal.color(QPalette::Active, QPalette::Midlight).darker(headerDarkness());
 
     /* Root-item: */
@@ -1671 +1657 @@
             /* Fill background: */
             QLinearGradient headerGradient(headerRect.bottomLeft(), headerRect.topLeft());
-            headerGradient.setColorAt(1, headerColor.darker(blackoutDarkness()));
+            headerGradient.setColorAt(1, headerColor.darker(headerDarkness()));
             headerGradient.setColorAt(0, headerColor.darker(animatedValue()));
             pPainter->fillRect(headerRect, headerGradient);
@@ -1690 +1676 @@
         QLinearGradient tGradient(tRect.bottomLeft(), tRect.topLeft());
         tGradient.setColorAt(1, headerColor.darker(animatedValue()));
-        tGradient.setColorAt(0, headerColor.darker(blackoutDarkness()));
+        tGradient.setColorAt(0, headerColor.darker(headerDarkness()));
         /* Fill top rectangle: */
         pPainter->fillRect(tRect, tGradient);

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

@@ -263 +263 @@
         bool isMainRoot() const { return m_fMainRoot; }
 
-        /** Returns blackout item darkness. */
-        int blackoutDarkness() const { return m_iBlackoutDarkness; }
+        /** Returns item's header darkness. */
+        int headerDarkness() const { return m_iHeaderDarkness; }
 
         /** Defines @a iAdditionalHeight. */
@@ -324 +324 @@
         /** Holds aditional height. */
         int  m_iAdditionalHeight;
-        /** Holds corner radious. */
-        int  m_iCornerRadius;
-        /** Holds blackout item darkness. */
-        int  m_iBlackoutDarkness;
+        /** Holds the header darkness. */
+        int  m_iHeaderDarkness;
 
         /** Holds the cached name. */