yukijoou/kwin
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'Plasma/5.2'

Browse source
This commit is contained in:
Martin Gräßlin 2015-01-16 12:50:42 +01:00
commit 5c6b89876a
1 changed files with 9 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
client.cpp
View file

@ -2294,13 +2294,17 @@ void Client::updateColorScheme()
// TODO: move into KWindowInfo
QString path = QString::fromUtf8(Xcb::StringProperty(m_client, atoms->kde_color_sheme));
path = rules()->checkDecoColor(path);
if (!path.isNull()) {
m_palette = KColorScheme::createApplicationPalette(KSharedConfig::openConfig(path));
QPalette p = m_palette;
if (!path.isEmpty()) {
p = KColorScheme::createApplicationPalette(KSharedConfig::openConfig(path));
} else {
m_palette = QApplication::palette();
p = QApplication::palette();
}
if (p != m_palette) {
m_palette = p;
emit paletteChanged(m_palette);
triggerDecorationRepaint();
}
emit paletteChanged(m_palette);
triggerDecorationRepaint();
}
bool Client::isClient() const