1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

WindowsQPA: Respect ENV and cmdline darkmode overrides

Browse Source 
Currently the commandline and environment parameters (windows:darkmode)
for setting the darkmode handling are ignored when the application
starts. This patch adds a condition to
QWindowsTheme::effectiveColorScheme that checks whether darkmode
handling was explicitly overridden and initializes in the constructor
the m_colorScheme with the result of passing Qt::ColorScheme::Unknown
toeffectiveColorScheme.

Fixes: QTBUG-127135
Change-Id: I365d26c66fdb3a754832cb7c579aeebecab093fd
Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
(cherry picked from commit 2ced94b4100c03c5feb7d5b1c0006c9fc451e944)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
This commit is contained in:
Wladimir Leuschner 2024-07-30 14:36:13 +02:00 committed by Qt Cherry-pick Bot
parent b33e0eac97
commit 31367fd2c8
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/plugins/platforms/windows/qwindowstheme.cpp
View File

@ -483,7 +483,8 @@ QWindowsTheme *QWindowsTheme::m_instance = nullptr;
QWindowsTheme::QWindowsTheme() QWindowsTheme::QWindowsTheme()
{ {
m_instance = this; m_instance = this;
s_colorScheme = QWindowsTheme::queryColorScheme(); s_colorScheme = Qt::ColorScheme::Unknown;
s_colorScheme = QWindowsTheme::effectiveColorScheme();
std::fill(m_fonts, m_fonts + NFonts, nullptr); std::fill(m_fonts, m_fonts + NFonts, nullptr);
std::fill(m_palettes, m_palettes + NPalettes, nullptr); std::fill(m_palettes, m_palettes + NPalettes, nullptr);
refresh(); refresh();
@ -578,12 +579,15 @@ Qt::ColorScheme QWindowsTheme::colorScheme() const
Qt::ColorScheme QWindowsTheme::effectiveColorScheme() Qt::ColorScheme QWindowsTheme::effectiveColorScheme()
{ {
auto integration = QWindowsIntegration::instance();
if (queryHighContrast()) if (queryHighContrast())
return Qt::ColorScheme::Unknown; return Qt::ColorScheme::Unknown;
if (s_colorSchemeOverride != Qt::ColorScheme::Unknown) if (s_colorSchemeOverride != Qt::ColorScheme::Unknown)
return s_colorSchemeOverride; return s_colorSchemeOverride;
if (s_colorScheme != Qt::ColorScheme::Unknown) if (s_colorScheme != Qt::ColorScheme::Unknown)
return s_colorScheme; return s_colorScheme;
if (!integration->darkModeHandling().testFlag(QWindowsApplication::DarkModeStyle))
return Qt::ColorScheme::Light;
return queryColorScheme(); return queryColorScheme();
} }