Skip to content

Fix dark mode in 1.6 #5178

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
SpeedyFolf wants to merge 1 commit into
base: release/1.6.0
Choose a base branch
from
+19 −7
Open

Fix dark mode in 1.6 #5178

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 19 additions & 7 deletions Client/core/DXHook/CProxyDirect3D9.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -331,8 +331,20 @@ HRESULT CProxyDirect3D9::CreateDevice(UINT Adapter, D3DDEVTYPE DeviceType, HWND
#endif

// Set dark titlebar if needed
BOOL darkTitleBar =
GetSystemRegistryValue((uint)HKEY_CURRENT_USER, "Software\\Microsoft\\Windows\\CurrentVersion\\Themes\\Personalize", "AppsUseLightTheme") == "\x0";
int themeStatus = 0;
const SString appsUseLightTheme =
GetSystemRegistryValue((uint)HKEY_CURRENT_USER, "Software\\Microsoft\\Windows\\CurrentVersion\\Themes\\Personalize", "AppsUseLightTheme", &themeStatus);
BOOL darkTitleBar = FALSE;
if (themeStatus > 0)
{
// Parse the registry value into a numeric flag
char* themeEnd = nullptr;
const long themeNumeric = strtol(appsUseLightTheme.c_str(), &themeEnd, 10);
if (themeEnd != appsUseLightTheme.c_str() && *themeEnd == '\0')
{
darkTitleBar = (themeNumeric == 0);
}
}
DwmSetWindowAttribute(hFocusWindow, DWMWA_USE_IMMERSIVE_DARK_MODE, &darkTitleBar, sizeof(darkTitleBar));

// Update icon
Expand Down Expand Up @@ -1182,7 +1194,7 @@ namespace
//
// Hook CCore::OnPreCreateDevice
//
// Modify paramters
// Modify parameters
//
////////////////////////////////////////////////
void CCore::OnPreCreateDevice(IDirect3D9* pDirect3D, UINT Adapter, D3DDEVTYPE DeviceType, HWND hFocusWindow, DWORD& BehaviorFlags,
Expand Down Expand Up @@ -1212,7 +1224,7 @@ void CCore::OnPreCreateDevice(IDirect3D9* pDirect3D, UINT Adapter, D3DDEVTYPE De
BehaviorFlagsOrig = BehaviorFlags;
presentationParametersOrig = *pPresentationParameters;

WriteDebugEvent(" Original paramters:");
WriteDebugEvent(" Original parameters:");
WriteDebugEvent(ToString(Adapter, DeviceType, hFocusWindow, BehaviorFlags, *pPresentationParameters));

// Make sure DirectX Get...() calls will work
Expand All @@ -1223,7 +1235,7 @@ void CCore::OnPreCreateDevice(IDirect3D9* pDirect3D, UINT Adapter, D3DDEVTYPE De

GetVideoModeManager()->PreCreateDevice(pPresentationParameters);

WriteDebugEvent(" Modified paramters:");
WriteDebugEvent(" Modified parameters:");
WriteDebugEvent(ToString(Adapter, DeviceType, hFocusWindow, BehaviorFlags, *pPresentationParameters));
}

Expand Down Expand Up @@ -1297,7 +1309,7 @@ HRESULT CCore::OnPostCreateDevice(HRESULT hResult, IDirect3D9* pDirect3D, UINT A
BehaviorFlagsOrig = BehaviorFlags;
presentationParametersOrig = *pPresentationParameters;

WriteDebugEvent(" Original paramters:");
WriteDebugEvent(" Original parameters:");
WriteDebugEvent(ToString(Adapter, DeviceType, hFocusWindow, BehaviorFlags, *pPresentationParameters));

// Make sure DirectX Get...() calls will work
Expand All @@ -1308,7 +1320,7 @@ HRESULT CCore::OnPostCreateDevice(HRESULT hResult, IDirect3D9* pDirect3D, UINT A

GetVideoModeManager()->PreCreateDevice(pPresentationParameters);

WriteDebugEvent(" Modified paramters:");
WriteDebugEvent(" Modified parameters:");
WriteDebugEvent(ToString(Adapter, DeviceType, hFocusWindow, BehaviorFlags, *pPresentationParameters));

hResult = CreateDeviceInsist(2, 1000, pDirect3D, Adapter, DeviceType, hFocusWindow, BehaviorFlags, pPresentationParameters, ppReturnedDeviceInterface);
Expand Down
Loading