Respect system colour scheme for title bar colour (#109)

This commit is contained in:
Hyper
2025-01-17 15:08:52 +00:00
committed by GitHub
parent 7c60e47eee
commit f8e6b74551
9 changed files with 68 additions and 13 deletions

View File

@@ -1,6 +1,7 @@
#include "game_window.h"
#include <gpu/video.h>
#include <os/logger.h>
#include <os/user.h>
#include <os/version.h>
#include <ui/sdl_listener.h>
#include <app.h>
@@ -238,7 +239,7 @@ void GameWindow::Init(const char* sdlVideoDriver)
static_assert(false, "Unknown platform.");
#endif
SetDarkTitleBar(true);
SetTitleBarColour();
SDL_ShowWindow(s_pWindow);
}
@@ -307,20 +308,23 @@ void GameWindow::SetTitle(const char* title)
SDL_SetWindowTitle(s_pWindow, title ? title : GetTitle());
}
void GameWindow::SetDarkTitleBar(bool isEnabled)
void GameWindow::SetTitleBarColour()
{
#if _WIN32
auto version = os::version::GetOSVersion();
if (os::user::IsDarkTheme())
{
auto version = os::version::GetOSVersion();
if (version.Major < 10 || version.Build <= 17763)
return;
if (version.Major < 10 || version.Build <= 17763)
return;
auto flag = version.Build >= 18985
? DWMWA_USE_IMMERSIVE_DARK_MODE
: 19; // DWMWA_USE_IMMERSIVE_DARK_MODE_BEFORE_20H1
auto flag = version.Build >= 18985
? DWMWA_USE_IMMERSIVE_DARK_MODE
: 19; // DWMWA_USE_IMMERSIVE_DARK_MODE_BEFORE_20H1
const DWORD useImmersiveDarkMode = isEnabled;
DwmSetWindowAttribute(s_renderWindow, flag, &useImmersiveDarkMode, sizeof(useImmersiveDarkMode));
const DWORD useImmersiveDarkMode = 1;
DwmSetWindowAttribute(s_renderWindow, flag, &useImmersiveDarkMode, sizeof(useImmersiveDarkMode));
}
#endif
}

View File

@@ -30,7 +30,7 @@ public:
static void SetIcon(bool isNight = false);
static const char* GetTitle();
static void SetTitle(const char* title = nullptr);
static void SetDarkTitleBar(bool isEnabled);
static void SetTitleBarColour();
static bool IsFullscreen();
static bool SetFullscreen(bool isEnabled);
static void SetFullscreenCursorVisibility(bool isVisible);