Changeset 108099 in vbox

Timestamp:

Feb 6, 2025 3:06:48 PM (3 months ago)

Author:

vboxsync

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

167397

Message:

FE/Qt: bugref:10814: VBox Manager / Tools pane: Tool view background color for MS Windows and Linux hosts for now; It's based on Accent color slightly blended into original Window color.

Location:

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

Files:

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

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

@@ -211 +211 @@
     QPalette pal = qApp->palette();
 
+#if defined(VBOX_WS_MAC)
+
     /* We are just taking the [in]active Window colors and
      * making them a bit darker/lighter according to theme: */
@@ -226 +228 @@
     pal.setColor(QPalette::Active, QPalette::Base, backgroundColorActive);
     pal.setColor(QPalette::Inactive, QPalette::Base, backgroundColorInactive);
+
+#else /* !VBOX_WS_MAC */
+
+    if (tools()->isPopup())
+    {
+        /* Same as on macOS for now, will go away soon: */
+        QColor backgroundColorActive = pal.color(QPalette::Active, QPalette::Window);
+        QColor backgroundColorInactive = pal.color(QPalette::Inactive, QPalette::Window);
+        if (!tools()->isPopup())
+        {
+            backgroundColorActive = uiCommon().isInDarkMode()
+                                  ? backgroundColorActive.lighter(120)
+                                  : backgroundColorActive.darker(108);
+            backgroundColorInactive = uiCommon().isInDarkMode()
+                                    ? backgroundColorInactive.lighter(120)
+                                    : backgroundColorInactive.darker(108);
+        }
+        pal.setColor(QPalette::Active, QPalette::Base, backgroundColorActive);
+        pal.setColor(QPalette::Inactive, QPalette::Base, backgroundColorInactive);
+    }
+    else
+    {
+        /* Blending Window color to 10% of Accent color: */
+        const QColor backgroundColor = pal.color(QPalette::Active, QPalette::Window);
+        const QColor accentColor = pal.color(QPalette::Active, QPalette::Accent);
+        const int iRed = iShift10(backgroundColor.red(), accentColor.red());
+        const int iGreen = iShift10(backgroundColor.green(), accentColor.green());
+        const int iBlue = iShift10(backgroundColor.blue(), accentColor.blue());
+        const QColor blendColor = QColor(qRgb(iRed, iGreen, iBlue));
+        pal.setColor(QPalette::Active, QPalette::Base, blendColor);
+        pal.setColor(QPalette::Inactive, QPalette::Base, blendColor);
+    }
+
+#endif /* !VBOX_WS_MAC */
 
     /* Assing changed palette: */
@@ -249 +285 @@
     setSceneRect(0, 0, m_iMinimumWidthHint, m_iMinimumHeightHint);
 }
+
+#ifndef VBOX_WS_MAC
+/* static */
+int UIToolsView::iShift10(int i1, int i2)
+{
+    const int iMin = qMin(i1, i2);
+    const int iMax = qMax(i1, i2);
+    const int iDiff = iMax - iMin;
+    const int iDiff10 = iDiff * 0.1;
+
+    int iResult = 0;
+    if (i1 > i2)
+        iResult = i1 - iDiff10;
+    else
+        iResult = i1 + iDiff10;
+
+    return qMin(255, iResult);
+}
+#endif /* VBOX_WS_WIN */

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

@@ -106 +106 @@
         /** Updates scene rectangle. */
         void updateSceneRect();
+
+#ifndef VBOX_WS_MAC
+        /** Returns a number shifter per 10% from @a i1 to @a i2. */
+        static int iShift10(int i1, int i2);
+#endif
     /** @} */