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

gtk3theme: Flush PlatformTheme palette on ColorScheme change

Browse Source 
System color palette only takes the ColorScheme (Bright/Dark) into
account during creation, which results in static color palette which
does not reflect changes requested by `updateColorScheme`.
Reinitialize the platform system color palette when ColorScheme
is changed.

Change-Id: I3f8f77a5990bda0f2db744f6ee8c6b392dfe8a84
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
This commit is contained in:
Piotr Wiercinski 2025-03-24 17:09:49 +01:00
parent caa0aa3fb4
commit 0dab50a124
2 changed files with 17 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/gui/kernel/qplatformtheme.cpp
View File

@ -376,7 +376,8 @@ QPlatformThemePrivate::QPlatformThemePrivate()
QPlatformThemePrivate::~QPlatformThemePrivate()
{
delete systemPalette;
if (systemPalette)
delete systemPalette;
}
Q_GUI_EXPORT QPalette qt_fusionPalette()
@ -476,8 +477,22 @@ Qt::ColorScheme QPlatformTheme::colorScheme() const
void QPlatformTheme::requestColorScheme(Qt::ColorScheme scheme)
{
Q_UNUSED(scheme);
Q_D(QPlatformTheme);
if (d->systemPalette) {
delete d->systemPalette;
d->systemPalette = nullptr;
}
}
/*!
\internal
\brief Return a color palette for type \a type.
When relying on system color palette keep in mind that it is
lazily initialized and cached. If it needs to be updated
(i.e. due to ColorScheme changes), it's up to the caller
to take care of it. See \c requestColorScheme.
*/
const QPalette *QPlatformTheme::palette(Palette type) const
{
Q_D(const QPlatformTheme);

1
src/plugins/platformthemes/gtk3/qgtk3theme.cpp
View File

@ -165,6 +165,7 @@ void QGtk3Theme::requestColorScheme(Qt::ColorScheme scheme)
return;
qCDebug(lcQGtk3Interface) << scheme << "has been requested. Theme supports color scheme:"
<< m_storage->colorScheme();
QPlatformTheme::requestColorScheme(scheme);
m_requestedColorScheme = scheme;
m_storage->handleThemeChange();
}