Changeset 88805 in vbox for trunk/src/VBox

Timestamp:

Apr 30, 2021 1:29:59 PM (4 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:10003: Reworking Chooser, Details and Tools panes backgrounds to have native colors.

Location:

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

Files:

• chooser/UIChooser.cpp (modified) (2 diffs)
• chooser/UIChooser.h (modified) (1 diff)
• chooser/UIChooserItemGroup.cpp (modified) (1 diff)
• chooser/UIChooserView.cpp (modified) (1 diff)
• details/UIDetailsGroup.cpp (modified) (1 diff)
• details/UIDetailsSet.cpp (modified) (1 diff)
• tools/UITools.cpp (modified) (2 diffs)
• tools/UITools.h (modified) (1 diff)
• tools/UIToolsView.cpp (modified) (1 diff)

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

@@ -212 +212 @@
 {
     /* Prepare everything: */
-    preparePalette();
     prepareModel();
     prepareWidgets();
@@ -219 +218 @@
     /* Init model: */
     initModel();
-}
-
-void UIChooser::preparePalette()
-{
-    setAutoFillBackground(true);
-    QPalette pal = palette();
-    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/UIChooser.h

@@ -198 +198 @@
         /** Prepares all. */
         void prepare();
-        /** Prepares palette. */
-        void preparePalette();
         /** Prepares model. */
         void prepareModel();

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

@@ -1588 +1588 @@
     pPainter->save();
 
-    /* Prepare color: */
-    const QPalette pal = palette();
-    const QColor headerColor = pal.color(QPalette::Active,
-                                         model()->selectedItems().contains(this) ?
-                                         QPalette::Highlight : QPalette::Midlight);
-
-    /* Root-item: */
-    if (isRoot())
-    {
-#if 0
-        /* Non-main root-item: */
-        if (!isMainRoot())
-        {
-            /* Prepare variables: */
-            const int iMarginV = data(GroupItemData_MarginV).toInt();
-            const int iFullHeaderHeight = 2 * iMarginV + m_minimumHeaderSize.height();
-            QRect headerRect = QRect(0, 0, rect.width(), iFullHeaderHeight);
-
-            /* Fill background: */
-            QLinearGradient headerGradient(headerRect.bottomLeft(), headerRect.topLeft());
-            headerGradient.setColorAt(1, headerColor.darker(headerDarkness()));
-            headerGradient.setColorAt(0, headerColor.darker(animatedValue()));
-            pPainter->fillRect(headerRect, headerGradient);
-        }
-#endif
-    }
     /* Non-root-item: */
-    else
-    {
+    if (!isRoot())
+    {
+        /* Prepare color: */
+        const QColor headerColor = QApplication::palette().color(QPalette::Active,
+                                                                 model()->selectedItems().contains(this) ?
+                                                                 QPalette::Highlight : QPalette::Window);
+
         /* Prepare variables: */
         const int iMarginV = data(GroupItemData_MarginV).toInt();

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

@@ -247 +247 @@
 {
     /* Prepare palette: */
-    QPalette pal = qApp->palette();
-    const QColor bodyColor = pal.color(QPalette::Active, QPalette::Midlight).darker(110);
-    pal.setColor(QPalette::Base, bodyColor);
+    QPalette pal = QApplication::palette();
+    pal.setColor(QPalette::Active, QPalette::Base, pal.color(QPalette::Active, QPalette::Window));
     setPalette(pal);
 

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

@@ -284 +284 @@
 
     /* Paint default background: */
-#ifdef VBOX_WS_MAC
-    const QColor defaultColor = palette().color(QPalette::Active, QPalette::Mid).lighter(145);
-#else
-    const QColor defaultColor = palette().color(QPalette::Active, QPalette::Mid).lighter(160);
-#endif
-    pPainter->fillRect(optionRect, defaultColor);
+    const QColor backgroundColor = QApplication::palette().color(QPalette::Active, QPalette::Window);
+    pPainter->fillRect(optionRect, backgroundColor);
 
     /* Restore painter: */

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

@@ -765 +765 @@
 
     /* Paint default background: */
-    const QColor defaultColor = palette().color(QPalette::Active, QPalette::Midlight).darker(110);
-    pPainter->fillRect(optionRect, defaultColor);
+    const QColor backgroundColor = QApplication::palette().color(QPalette::Active, QPalette::Window);
+    pPainter->fillRect(optionRect, backgroundColor);
 
     /* Restore painter: */

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

@@ -100 +100 @@
 {
     /* Prepare everything: */
-    preparePalette();
     prepareContents();
     prepareConnections();
@@ -106 +105 @@
     /* Init model finally: */
     initModel();
-}
-
-void UITools::preparePalette()
-{
-    setAutoFillBackground(true);
-    QPalette pal = palette();
-    QColor bodyColor = pal.color(QPalette::Active, QPalette::Midlight).darker(110);
-    pal.setColor(QPalette::Window, bodyColor);
-    setPalette(pal);
 }
 

trunk/src/VBox/Frontends/VirtualBox/src/manager/tools/UITools.h

@@ -110 +110 @@
         /** Prepares all. */
         void prepare();
-        /** Prepares palette. */
-        void preparePalette();
         /** Prepares contents. */
         void prepareContents();

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

@@ -184 +184 @@
     /* Setup palette: */
     QPalette pal = qApp->palette();
-    const QColor bodyColor = pal.color(QPalette::Active, QPalette::Midlight).darker(110);
-    pal.setColor(QPalette::Base, bodyColor);
+    pal.setColor(QPalette::Active, QPalette::Base, pal.color(QPalette::Active, QPalette::Window));
     setPalette(pal);
 }