Changeset 102525 in vbox

Timestamp:

Dec 7, 2023 3:17:24 PM (15 months ago)

Author:

vboxsync

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

160669

Message:

FE/Qt: UICommon: Move dark-mode getter to cross-platform area, this is applicable to macOS and Windows host at least; We have the detection code for both hosts anyway, so we can handle changes for both platforms as well.

Location:

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

Files:

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

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

@@ -193 +193 @@
 #ifdef VBOX_WS_MAC
     , m_enmMacOSVersion(MacOSXRelease_Old)
-    , m_fDarkMode(false)
 #endif
 #ifdef VBOX_WS_NIX
@@ -200 +199 @@
     , m_enmDisplayServerType(VBGHDISPLAYSERVERTYPE_NONE)
 #endif
+    , m_fDarkMode(false)
     , m_fSeparateProcess(false)
     , m_fShowStartVMErrors(true)
@@ -322 +322 @@
     m_pThreadPoolCloud = new UIThreadPool(2 /* worker count */, 1000 /* worker timeout */);
 
-#ifdef VBOX_WS_MAC
-    /* Load whether macOS is in Dark mode: */
+    /* Load whether host OS is in Dark mode: */
+#if defined(VBOX_WS_MAC)
     m_fDarkMode = UICocoaApplication::instance()->isDarkMode();
+#elif defined(VBOX_WS_WIN)
+    m_fDarkMode = isWindowsInDarkMode();
 #endif
     /* Load color theme: */
@@ -1095 +1097 @@
 
     /* For the Dark mode! */
-    if (isWindowsInDarkMode())
+    if (isInDarkMode())
     {
         qApp->setStyle(QStyleFactory::create("Fusion"));
@@ -2858 +2860 @@
     }
 
-#ifdef VBOX_WS_MAC
+#if defined(VBOX_WS_MAC) || defined(VBOX_WS_WIN)
     /* Handle application palette change event: */
     if (   pEvent->type() == QEvent::ApplicationPaletteChange
         && pObject == windowManager().mainWindowShown())
     {
+# if defined(VBOX_WS_MAC)
         const bool fDarkMode = UICocoaApplication::instance()->isDarkMode();
+# elif defined(VBOX_WS_WIN)
+        const bool fDarkMode = isWindowsInDarkMode();
+# endif
         if (m_fDarkMode != fDarkMode)
         {
@@ -2871 +2877 @@
         }
     }
-#endif
+#endif /* VBOX_WS_MAC || VBOX_WS_WIN */
 
     /* Call to base-class: */

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

@@ -218 +218 @@
         /** macOS: Returns #MacOSXRelease determined during UICommon prepare routine. */
         MacOSXRelease osRelease() const { return m_enmMacOSVersion; }
-
-        /** macOS: Returns whether macOS is in Dark mode. */
-        bool isInDarkMode() const { return m_fDarkMode; }
 #endif
 
@@ -240 +237 @@
         bool isWindowsInDarkMode() const;
 #endif
+
+        /** Returns whether host OS is in Dark mode. */
+        bool isInDarkMode() const { return m_fDarkMode; }
 
         /** Loads the color theme. */
@@ -670 +670 @@
         /** macOS: Holds the #MacOSXRelease determined using <i>uname</i> call. */
         MacOSXRelease  m_enmMacOSVersion;
-
-        /** macOS: Holds whether macOS is in Dark mode. */
-        bool  m_fDarkMode;
 #endif
 
@@ -683 +680 @@
         VBGHDISPLAYSERVERTYPE m_enmDisplayServerType;
 #endif
+
+        /** Holds whether host OS is in Dark mode. */
+        bool  m_fDarkMode;
     /** @} */