Initialize dark mode also when emulation window is opened.

diff --git a/od-win32/win32.cpp b/od-win32/win32.cpp
index 1f4af36591c305c5b18e866eb659e6e51cdd1451..39a504ad976cfe2d2b8642cd52be45b37271018d 100644 (file)
--- a/od-win32/win32.cpp
+++ b/od-win32/win32.cpp
@@ -8252,12 +8252,19 @@ bool is_mainthread(void)
        return GetCurrentThreadId() == mainthreadid;
 }
 
-void InitializeDarkMode(int v)
+void InitializeDarkMode(void)
 {
        static int initialized = -10;
+
+       int v = -1;
+       regqueryint(NULL, _T("GUIDarkMode"), &v);
+       if (rp_isactive()) {
+               v = -2;
+       }
        if (darkModeForced) {
                v = 1;
        }
+
        if (initialized != v) {
                InitDarkMode(v);
                write_log("dark mode supported: %d enabled: %d\n", g_darkModeSupported, g_darkModeEnabled);

diff --git a/od-win32/win32.h b/od-win32/win32.h
index a969a89dff696e13d0a035c8bf4e1d134f330c99..96c308796487b15bd1b799863c1fa95904cdbe11 100644 (file)
--- a/od-win32/win32.h
+++ b/od-win32/win32.h
@@ -75,7 +75,7 @@ extern void updatemouseclip(struct AmigaMonitor*);
 extern void updatewinrect(struct AmigaMonitor*, bool);
 int getdpiformonitor(HMONITOR mon);
 int getdpiforwindow(HWND hwnd);
-void InitializeDarkMode(int v);
+void InitializeDarkMode(void);
 
 extern bool resumepaused (int priority);
 extern bool setpaused (int priority);

diff --git a/od-win32/win32gfx.cpp b/od-win32/win32gfx.cpp
index 22f0e4b5348c215e623eeadaf904dce31991c3c8..844fec4cd153773a5b2e024a0381f3155ae429aa 100644 (file)
--- a/od-win32/win32gfx.cpp
+++ b/od-win32/win32gfx.cpp
@@ -3137,6 +3137,7 @@ void machdep_free(void)
 
 int graphics_init(bool mousecapture)
 {
+       InitializeDarkMode();
        systray (hHiddenWnd, TRUE);
        systray (hHiddenWnd, FALSE);
        d3d_select(&currprefs);

diff --git a/od-win32/win32gui.cpp b/od-win32/win32gui.cpp
index 36d20bf7bc260ead6db24bda90e364a769356ec6..32171950879b9a4f9add17eb0105c4ec57021fbd 100644 (file)
--- a/od-win32/win32gui.cpp
+++ b/od-win32/win32gui.cpp
@@ -23407,10 +23407,7 @@ static int GetSettings (int all_options, HWND hwnd)
                v = -1;
                regqueryint(NULL, _T("GUIDarkMode"), &v);
                gui_darkmode = v;
-               if (rp_isactive()) {
-                       v = -2;
-               }
-               InitializeDarkMode(v);
+               InitializeDarkMode();
                v = 0;
                regqueryint(NULL, _T("GUIFullscreen"), &v);
                if (v) {