From 681bc9c5d5960836ef72bff3db53789a147063de Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kacper=20Michaj=C5=82ow?= Date: Sun, 19 Mar 2023 06:40:53 +0100 Subject: [PATCH] win32: follow Windows settings and update dark mode state Microsoft documented how to enable dark mode for title bar: https://learn.microsoft.com/windows/apps/desktop/modernize/apply-windows-themes https://learn.microsoft.com/windows/win32/api/dwmapi/ne-dwmapi-dwmwindowattribute Documentation says to set the DWMWA_USE_IMMERSIVE_DARK_MODE attribute to TRUE to honor dark mode for the window, FALSE to always use light mode. While in fact setting it to TRUE causes dark mode to be always enabled, regardless of the settings. Since it is quite unlikely that it will be fixed, just use UxTheme API to check if dark mode should be applied and while at it enable it fully. Ideally this function should only call the DwmSetWindowAttribute(), but it just doesn't work as documented. Fixes: #6901 --- meson.build | 1 + video/out/w32_common.c | 48 ++++++++++++++++++++++++++++++++++++++++++ wscript | 9 +++++++- 3 files changed, 57 insertions(+), 1 deletion(-) diff --git a/meson.build b/meson.build index 1597543e0aa2e..b6bd630e681b9 100644 --- a/meson.build +++ b/meson.build @@ -477,6 +477,7 @@ if features['win32-desktop'] cc.find_library('gdi32'), cc.find_library('ole32'), cc.find_library('uuid'), + cc.find_library('uxtheme'), cc.find_library('version'), cc.find_library('winmm')] dependencies += win32_desktop_libs diff --git a/video/out/w32_common.c b/video/out/w32_common.c index 64d69d8242c8b..8a7c1579521d7 100644 --- a/video/out/w32_common.c +++ b/video/out/w32_common.c @@ -54,6 +54,10 @@ EXTERN_C IMAGE_DOS_HEADER __ImageBase; #define WM_DPICHANGED (0x02E0) #endif +#ifndef DWMWA_USE_IMMERSIVE_DARK_MODE +#define DWMWA_USE_IMMERSIVE_DARK_MODE 20 +#endif + #ifndef DPI_ENUMS_DECLARED typedef enum MONITOR_DPI_TYPE { MDT_EFFECTIVE_DPI = 0, @@ -70,6 +74,8 @@ struct w32_api { HRESULT (WINAPI *pGetDpiForMonitor)(HMONITOR, MONITOR_DPI_TYPE, UINT*, UINT*); BOOL (WINAPI *pImmDisableIME)(DWORD); BOOL (WINAPI *pAdjustWindowRectExForDpi)(LPRECT lpRect, DWORD dwStyle, BOOL bMenu, DWORD dwExStyle, UINT dpi); + BOOLEAN (WINAPI *pShouldAppsUseDarkMode)(void); + DWORD (WINAPI *pSetPreferredAppMode)(DWORD mode); }; struct vo_w32_state { @@ -1000,6 +1006,36 @@ static void reinit_window_state(struct vo_w32_state *w32) update_window_state(w32); } +// Follow Windows settings and update dark mode state +// Microsoft documented how to enable dark mode for title bar: +// https://learn.microsoft.com/windows/apps/desktop/modernize/apply-windows-themes +// https://learn.microsoft.com/windows/win32/api/dwmapi/ne-dwmapi-dwmwindowattribute +// Documentation says to set the DWMWA_USE_IMMERSIVE_DARK_MODE attribute to +// TRUE to honor dark mode for the window, FALSE to always use light mode. While +// in fact setting it to TRUE causes dark mode to be always enabled, regardless +// of the settings. Since it is quite unlikely that it will be fixed, just use +// UxTheme API to check if dark mode should be applied and while at it enable it +// fully. Ideally this function should only call the DwmSetWindowAttribute(), +// but it just doesn't work as documented. +static void update_dark_mode(const struct vo_w32_state *w32) +{ + if (w32->api.pSetPreferredAppMode) + w32->api.pSetPreferredAppMode(1); // allow dark mode + + HIGHCONTRAST hc = {sizeof(hc)}; + SystemParametersInfo(SPI_GETHIGHCONTRAST, sizeof(hc), &hc, 0); + bool high_contrast = hc.dwFlags & HCF_HIGHCONTRASTON; + + // if pShouldAppsUseDarkMode is not available, just assume it to be true + const BOOL use_dark_mode = !high_contrast && (!w32->api.pShouldAppsUseDarkMode || + w32->api.pShouldAppsUseDarkMode()); + + SetWindowTheme(w32->window, use_dark_mode ? L"DarkMode_Explorer" : L"", NULL); + + DwmSetWindowAttribute(w32->window, DWMWA_USE_IMMERSIVE_DARK_MODE, + &use_dark_mode, sizeof(use_dark_mode)); +} + static LRESULT CALLBACK WndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam) { @@ -1293,6 +1329,9 @@ static LRESULT CALLBACK WndProc(HWND hWnd, UINT message, WPARAM wParam, case WM_DISPLAYCHANGE: force_update_display_info(w32); break; + case WM_SETTINGCHANGE: + update_dark_mode(w32); + break; } if (message == w32->tbtnCreatedMsg) { @@ -1502,6 +1541,13 @@ static void w32_api_load(struct vo_w32_state *w32) HMODULE imm32_dll = LoadLibraryW(L"imm32.dll"); w32->api.pImmDisableIME = !imm32_dll ? NULL : (void *)GetProcAddress(imm32_dll, "ImmDisableIME"); + + // Dark mode related functions, avaliable since a Win10 update + HMODULE uxtheme_dll = GetModuleHandle(L"uxtheme.dll"); + w32->api.pShouldAppsUseDarkMode = !uxtheme_dll ? NULL : + (void *)GetProcAddress(uxtheme_dll, MAKEINTRESOURCEA(132)); + w32->api.pSetPreferredAppMode = !uxtheme_dll ? NULL : + (void *)GetProcAddress(uxtheme_dll, MAKEINTRESOURCEA(135)); } static void *gui_thread(void *ptr) @@ -1543,6 +1589,8 @@ static void *gui_thread(void *ptr) goto done; } + update_dark_mode(w32); + if (SUCCEEDED(OleInitialize(NULL))) { ole_ok = true; diff --git a/wscript b/wscript index fafd15b0e1a08..c0c53f1abc531 100644 --- a/wscript +++ b/wscript @@ -201,7 +201,14 @@ main_dependencies = [ 'name': 'win32-desktop', 'desc': 'win32 desktop APIs', 'deps': '(os-win32 || os-cygwin) && !uwp', - 'func': check_cc(lib=['winmm', 'gdi32', 'ole32', 'uuid', 'avrt', 'dwmapi', 'version']), + 'func': check_cc(lib=['avrt', + 'dwmapi', + 'gdi32', + 'ole32', + 'uuid', + 'uxtheme', + 'version', + 'winmm']), }, { 'name': '--win32-internal-pthreads', 'desc': 'internal pthread wrapper for win32 (Vista+)',