Changeset 89248 in vbox

Timestamp:

May 24, 2021 4:53:33 PM (4 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

144591

Message:

FE/Qt: bugref:10003: Reworking VirtualBox Manager colors to be native; It's about carcass only, unrelated to embedded panes.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• extensions/QIToolBar.cpp (modified) (1 diff)
• manager/UIVirtualBoxManager.cpp (modified) (1 diff)
• manager/UIVirtualBoxManagerWidget.cpp (modified) (3 diffs)
• manager/UIVirtualBoxManagerWidget.h (modified) (1 diff)
• widgets/graphics/UIGraphicsScrollBar.cpp (modified) (5 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/extensions/QIToolBar.cpp

@@ -112 +112 @@
 
         /* Prepare gradient: */
-        const QColor backgroundColor = QApplication::palette().color(QPalette::Active, QPalette::Mid);
+        const QColor backgroundColor = QApplication::palette().color(QPalette::Active, QPalette::Window);
         QLinearGradient gradient(rectangle.topLeft(), rectangle.bottomLeft());
-        gradient.setColorAt(0, backgroundColor.lighter(130));
-        gradient.setColorAt(1, backgroundColor.lighter(125));
+        gradient.setColorAt(0, backgroundColor.darker(105));
+        gradient.setColorAt(1, backgroundColor.darker(115));
 
         /* Fill background: */

trunk/src/VBox/Frontends/VirtualBox/src/manager/UIVirtualBoxManager.cpp

@@ -2225 +2225 @@
         /* Make sure menu-bar fills own solid background: */
         menuBar()->setAutoFillBackground(true);
-        QPalette pal = QApplication::palette();
-        const QColor color = pal.color(QPalette::Active, QPalette::Mid).lighter(160);
-        pal.setColor(QPalette::Active, QPalette::Button, color);
-        menuBar()->setPalette(pal);
+# ifdef VBOX_WS_WIN
+        // WORKAROUND:
+        // On Windows we have to override Windows Vista style with style-sheet:
+        menuBar()->setStyleSheet(QString("QMenuBar { background-color: %1; }")
+                                        .arg(QApplication::palette().color(QPalette::Active, QPalette::Window).name(QColor::HexRgb)));
+# endif
     }
 #endif

trunk/src/VBox/Frontends/VirtualBox/src/manager/UIVirtualBoxManagerWidget.cpp

@@ -551 +551 @@
 {
     /* Prepare everything: */
-    preparePalette();
     prepareWidgets();
     prepareConnections();
@@ -563 +562 @@
     /* Make sure current Chooser-pane index fetched: */
     sltHandleChooserPaneIndexChange();
-}
-
-void UIVirtualBoxManagerWidget::preparePalette()
-{
-    setAutoFillBackground(true);
-    QPalette pal = QApplication::palette();
-#ifdef VBOX_WS_MAC
-    const QColor color = pal.color(QPalette::Active, QPalette::Mid).lighter(145);
-#else
-    const QColor color = pal.color(QPalette::Active, QPalette::Mid).lighter(160);
-#endif
-    pal.setColor(QPalette::Window, color);
-    setPalette(pal);
 }
 
@@ -696 +682 @@
 
             /* Adjust splitter colors according to main widgets it splits: */
-            m_pSplitter->configureColor(QApplication::palette().color(QPalette::Active, QPalette::Midlight).darker(110));
+            m_pSplitter->configureColor(QApplication::palette().color(QPalette::Active, QPalette::Window).darker(130));
             /* Set the initial distribution. The right site is bigger. */
             m_pSplitter->setStretchFactor(0, 2);

trunk/src/VBox/Frontends/VirtualBox/src/manager/UIVirtualBoxManagerWidget.h

@@ -292 +292 @@
         /** Prepares all. */
         void prepare();
-        /** Prepares palette. */
-        void preparePalette();
         /** Prepares widgets. */
         void prepareWidgets();

trunk/src/VBox/Frontends/VirtualBox/src/widgets/graphics/UIGraphicsScrollBar.cpp

@@ -158 +158 @@
 
     /* Draw background: */
-    QColor backgroundColor = pal.color(QPalette::Active, QPalette::Mid);
-    backgroundColor = backgroundColor.darker(140);
+    QColor backgroundColor = pal.color(QPalette::Active, QPalette::Window).darker(190);
     QRectF actualRectangle = pOptions->rect;
     actualRectangle.setLeft(pOptions->rect.left() + .22 * pOptions->rect.width());
@@ -175 +174 @@
 
     /* Draw background: */
-    QColor backgroundColor = pal.color(QPalette::Active, QPalette::Mid);
+    QColor backgroundColor = pal.color(QPalette::Active, QPalette::Window).darker(140);
     pPainter->fillRect(pOptions->rect, backgroundColor);
 
@@ -1016 +1015 @@
     if (m_iHoveringValue < 100)
     {
-        QColor tokenColor = pal.color(QPalette::Active, QPalette::Mid);
+        QColor tokenColor = pal.color(QPalette::Active, QPalette::Window);
         tokenColor.setAlpha(255 * ((double)m_iRevealingValue / 100));
-        tokenColor = tokenColor.darker(140);
+        tokenColor = tokenColor.darker(190);
         QRectF tokenRectangle = QRect(actualTokenPosition(), QSize(m_iExtent, 2 * m_iExtent));
         QRectF actualRectangle = tokenRectangle;
@@ -1044 +1043 @@
 
     /* Draw background: */
-    QColor backgroundColor = pal.color(QPalette::Active, QPalette::Midlight);
+    QColor backgroundColor = pal.color(QPalette::Active, QPalette::Window);
     backgroundColor.setAlpha(50 + (double)m_iHoveringValue / 100 * 150);
     QRect actualRectangle = rectangle;
@@ -1053 +1052 @@
     if (m_iHoveringValue < 100)
     {
-        QColor tokenColor = pal.color(QPalette::Active, QPalette::Dark);
+        QColor tokenColor = pal.color(QPalette::Active, QPalette::Window).darker(140);
         QRect tokenRectangle = QRect(actualTokenPosition(), QSize(m_iExtent, m_iExtent));
         tokenRectangle.setLeft(tokenRectangle.left() + .85 * tokenRectangle.width() * ((double)100 - m_iHoveringValue) / 100);