Changeset 102482 in vbox

Timestamp:

Dec 5, 2023 4:10:24 PM (16 months ago)

Author:

vboxsync

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

160625

Message:

FE/Qt: macOS: Hardcode native Window colors as Qt has them far far away from the native apps.

Location:

trunk/src/VBox/Frontends/VirtualBox/src/globals

Files:

• UICommon.cpp (modified) (4 diffs)
• UICommon.h (modified) (2 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/globals/UICommon.cpp

@@ -319 +319 @@
     m_fDarkMode = UICocoaApplication::instance()->isDarkMode();
 #endif
-#ifdef VBOX_WS_WIN
     /* Load color theme: */
     loadColorTheme();
-#endif
 
     /* Load translation based on the user settings: */
@@ -957 +955 @@
 }
 
-#ifdef VBOX_WS_WIN
-/* static */
 void UICommon::loadColorTheme()
 {
+#if defined (VBOX_WS_MAC)
+    /* macOS has Window color hardcoded somewhere inside, Qt has no access to it,
+     * moreover these colors are influenced by window background blending,
+     * making Qt default colors incredibly inconsistent with native macOS apps. */
+    QPalette pal = qApp->palette();
+    if (isInDarkMode())
+    {
+        pal.setColor(QPalette::Active, QPalette::Window, QColor("#252328"));
+        pal.setColor(QPalette::Inactive, QPalette::Window, QColor("#2A2630"));
+    }
+    else
+    {
+        pal.setColor(QPalette::Active, QPalette::Window, QColor("#E1DEE4"));
+        pal.setColor(QPalette::Inactive, QPalette::Window, QColor("#EEE8E9"));
+    }
+    qApp->setPalette(pal);
+
+#elif defined(VBOX_WS_WIN)
+
     /* Load saved color theme: */
     UIColorThemeType enmColorTheme = gEDataManager->colorTheme();
@@ -1002 +1017 @@
         qApp->setStyleSheet("QToolTip { color: #ffffff; background-color: #2b2b2b; border: 1px solid #737373; }");
     }
-}
 #endif /* VBOX_WS_WIN */
+}
 
 bool UICommon::processArgs()
@@ -2746 +2761 @@
         {
             m_fDarkMode = fDarkMode;
+            loadColorTheme();
             emit sigThemeChange();
         }

trunk/src/VBox/Frontends/VirtualBox/src/globals/UICommon.h

@@ -176 +176 @@
         /** Returns whether UICommon instance cleanup is in progress. */
         bool isCleaningUp() const { return m_fCleaningUp; }
+
+#ifdef VBOX_WS_MAC
+        /** Returns whether macOS is in Dark mode. */
+        bool isInDarkMode() const { return m_fDarkMode; }
+#endif
     /** @} */
 
@@ -213 +218 @@
     /** @name Host OS stuff.
      * @{ */
-#ifdef VBOX_WS_WIN
         /** Loads the color theme. */
-        static void loadColorTheme();
-#endif
+        void loadColorTheme();
 
 #ifdef VBOX_WS_NIX