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

[aurorae] Handle client palette changes

Browse source 
When the client's palette changes we need to update the internal colors
and emit a colorChanged, so that the decoration can repaint.

BUG: 357311
FIXED-IN: 5.5.5
REVIEW: 126891
This commit is contained in:
Martin Gräßlin 2016-01-26 11:38:11 +01:00
parent 11514079ea
commit 3434358acd
2 changed files with 8 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
clients/aurorae/src/decorationoptions.cpp
View file

@ -172,9 +172,16 @@ void DecorationOptions::setDecoration(KDecoration2::Decoration *decoration)
disconnect(s.data(), &KDecoration2::DecorationSettings::fontChanged, this, &DecorationOptions::fontChanged); disconnect(s.data(), &KDecoration2::DecorationSettings::fontChanged, this, &DecorationOptions::fontChanged);
disconnect(s.data(), &KDecoration2::DecorationSettings::decorationButtonsLeftChanged, this, &DecorationOptions::titleButtonsChanged); disconnect(s.data(), &KDecoration2::DecorationSettings::decorationButtonsLeftChanged, this, &DecorationOptions::titleButtonsChanged);
disconnect(s.data(), &KDecoration2::DecorationSettings::decorationButtonsRightChanged, this, &DecorationOptions::titleButtonsChanged); disconnect(s.data(), &KDecoration2::DecorationSettings::decorationButtonsRightChanged, this, &DecorationOptions::titleButtonsChanged);
disconnect(m_paletteConnection);
} }
m_decoration = decoration; m_decoration = decoration;
connect(m_decoration->client().data(), &KDecoration2::DecoratedClient::activeChanged, this, &DecorationOptions::slotActiveChanged); connect(m_decoration->client().data(), &KDecoration2::DecoratedClient::activeChanged, this, &DecorationOptions::slotActiveChanged);
m_paletteConnection = connect(m_decoration->client().data(), &KDecoration2::DecoratedClient::paletteChanged, this,
[this] (const QPalette &pal) {
m_colors.update(pal);
emit colorsChanged();
}
);
auto s = m_decoration->settings(); auto s = m_decoration->settings();
connect(s.data(), &KDecoration2::DecorationSettings::fontChanged, this, &DecorationOptions::fontChanged); connect(s.data(), &KDecoration2::DecorationSettings::fontChanged, this, &DecorationOptions::fontChanged);
connect(s.data(), &KDecoration2::DecorationSettings::decorationButtonsLeftChanged, this, &DecorationOptions::titleButtonsChanged); connect(s.data(), &KDecoration2::DecorationSettings::decorationButtonsLeftChanged, this, &DecorationOptions::titleButtonsChanged);

1
clients/aurorae/src/decorationoptions.h
View file

@ -244,6 +244,7 @@ private:
bool m_active; bool m_active;
KDecoration2::Decoration *m_decoration; KDecoration2::Decoration *m_decoration;
ColorSettings m_colors; ColorSettings m_colors;
QMetaObject::Connection m_paletteConnection;
}; };
class Borders : public QObject class Borders : public QObject