Changeset 74085 in vbox for trunk

Timestamp:

Sep 5, 2018 1:30:48 PM (6 years ago)

Author:

vboxsync

Message:

FE/Qt: VirtualBox Manager UI: Chooser pane re-styling: Apply background instead of painting it manually each time.

Location:

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

Files:

• UIChooser.cpp (modified) (1 diff)
• UIChooserItemGroup.cpp (modified) (3 diffs)
• UIChooserView.cpp (modified) (2 diffs)
• UIChooserView.h (modified) (1 diff)

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

@@ -117 +117 @@
     setAutoFillBackground(true);
     QPalette pal = palette();
-    pal.setColor(QPalette::Window, pal.color(QPalette::Active, QPalette::Base));
+    QColor bodyColor = pal.color(QPalette::Active, QPalette::Midlight).darker(110);
+    pal.setColor(QPalette::Window, bodyColor);
     setPalette(pal);
 }

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

@@ -1630 +1630 @@
 
     /* Prepare color: */
-    QPalette pal = palette();
-    QColor headerColor = pal.color(QPalette::Active,
-                                   model()->currentItems().contains(this) ?
-                                   QPalette::Highlight : QPalette::Midlight);
-    QColor bodyColor = pal.color(QPalette::Active, QPalette::Midlight).darker(headerDarkness());
+    const QPalette pal = palette();
+    const QColor headerColor = pal.color(QPalette::Active,
+                                         model()->currentItems().contains(this) ?
+                                         QPalette::Highlight : QPalette::Midlight);
 
     /* Root-item: */
     if (isRoot())
     {
-        /* Main root-item: */
-        if (isMainRoot())
-        {
-            /* Simple and clear: */
-            pPainter->fillRect(rect, bodyColor);
-        }
         /* Non-main root-item: */
-        else
+        if (!isMainRoot())
         {
             /* Prepare variables: */
-            int iMargin = data(GroupItemData_VerticalMargin).toInt();
-            int iFullHeaderHeight = 2 * iMargin + m_minimumHeaderSize.height();
-            int iFullBodyHeight = rect.height() - iFullHeaderHeight;
+            const int iMargin = data(GroupItemData_VerticalMargin).toInt();
+            const int iFullHeaderHeight = 2 * iMargin + m_minimumHeaderSize.height();
             QRect headerRect = QRect(0, 0, rect.width(), iFullHeaderHeight);
-            QRect bodyRect = QRect(0, iFullHeaderHeight, rect.width(), iFullBodyHeight);
 
             /* Fill background: */
@@ -1660 +1651 @@
             headerGradient.setColorAt(0, headerColor.darker(animatedValue()));
             pPainter->fillRect(headerRect, headerGradient);
-            pPainter->fillRect(bodyRect, bodyColor);
         }
     }
@@ -1667 +1657 @@
     {
         /* Prepare variables: */
-        int iMargin = data(GroupItemData_VerticalMargin).toInt();
-        int iFullHeaderHeight = 2 * iMargin + m_minimumHeaderSize.height();
+        const int iMargin = data(GroupItemData_VerticalMargin).toInt();
+        const int iFullHeaderHeight = 2 * iMargin + m_minimumHeaderSize.height();
 
         /* Calculate top rectangle: */

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

@@ -106 +106 @@
     QAccessible::installFactory(UIAccessibilityInterfaceForUIChooserView::pFactory);
 
+    /* Prepare palette: */
+    preparePalette();
+
     /* Setup frame: */
     setFrameShape(QFrame::NoFrame);
@@ -168 +171 @@
 }
 
+void UIChooserView::preparePalette()
+{
+    /* Setup palette: */
+    QPalette pal = qApp->palette();
+    const QColor bodyColor = pal.color(QPalette::Active, QPalette::Midlight).darker(110);
+    pal.setColor(QPalette::Base, bodyColor);
+    setPalette(pal);
+}
+
 void UIChooserView::resizeEvent(QResizeEvent *pEvent)
 {

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

@@ -60 +60 @@
     virtual void retranslateUi() /* override */;
 
+    /* Helper: Prepare stuff: */
+    void preparePalette();
+
     /* Handler: Resize-event stuff: */
     void resizeEvent(QResizeEvent *pEvent);