Katana_mirror/katie
1
0
Fork 0
mirror of https://bitbucket.org/smil3y/katie.git synced 2025-02-24 02:42:55 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

apply palette from the QGuiPlatformPlugin instance if it is not null

Browse source 
palette from the config overrides even the platform plugin still (as it is
with the style for example)

Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
This commit is contained in:
Ivailo Monev 2023-08-21 03:18:50 +03:00
parent 0d219c845c
commit 1d8cc1be87
1 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/gui/kernel/qapplication_x11.cpp
View file

@ -599,9 +599,14 @@ bool QApplicationPrivate::x11_apply_settings()
QColor(strlist[i])); QColor(strlist[i]));
} }
// ### Fix properly for 4.6 if (groupCount == QPalette::NColorGroups) {
if (groupCount == QPalette::NColorGroups)
QApplicationPrivate::setSystemPalette(pal); QApplicationPrivate::setSystemPalette(pal);
} else {
pal = qt_guiPlatformPlugin()->palette();
if (pal != QPalette()) {
QApplicationPrivate::setSystemPalette(pal);
}
}
QString fontDescription = settings.string(QLatin1String("Qt/font")); QString fontDescription = settings.string(QLatin1String("Qt/font"));
if (!fontDescription.isEmpty()) { if (!fontDescription.isEmpty()) {