Changeset View
Changeset View
Standalone View
Standalone View
plugins/kdecorations/aurorae/src/decorationoptions.cpp
Show First 20 Lines • Show All 161 Lines • ▼ Show 20 Line(s) | |||||
162 | 162 | | |||
163 | void DecorationOptions::setDecoration(KDecoration2::Decoration *decoration) | 163 | void DecorationOptions::setDecoration(KDecoration2::Decoration *decoration) | ||
164 | { | 164 | { | ||
165 | if (m_decoration == decoration) { | 165 | if (m_decoration == decoration) { | ||
166 | return; | 166 | return; | ||
167 | } | 167 | } | ||
168 | if (m_decoration) { | 168 | if (m_decoration) { | ||
169 | // disconnect from existing decoration | 169 | // disconnect from existing decoration | ||
170 | disconnect(m_decoration->client().data(), &KDecoration2::DecoratedClient::activeChanged, this, &DecorationOptions::slotActiveChanged); | 170 | disconnect(m_decoration->client().toStrongRef().data(), &KDecoration2::DecoratedClient::activeChanged, this, &DecorationOptions::slotActiveChanged); | ||
171 | auto s = m_decoration->settings(); | 171 | auto s = m_decoration->settings(); | ||
172 | disconnect(s.data(), &KDecoration2::DecorationSettings::fontChanged, this, &DecorationOptions::fontChanged); | 172 | disconnect(s.data(), &KDecoration2::DecorationSettings::fontChanged, this, &DecorationOptions::fontChanged); | ||
173 | disconnect(s.data(), &KDecoration2::DecorationSettings::decorationButtonsLeftChanged, this, &DecorationOptions::titleButtonsChanged); | 173 | disconnect(s.data(), &KDecoration2::DecorationSettings::decorationButtonsLeftChanged, this, &DecorationOptions::titleButtonsChanged); | ||
174 | disconnect(s.data(), &KDecoration2::DecorationSettings::decorationButtonsRightChanged, this, &DecorationOptions::titleButtonsChanged); | 174 | disconnect(s.data(), &KDecoration2::DecorationSettings::decorationButtonsRightChanged, this, &DecorationOptions::titleButtonsChanged); | ||
175 | disconnect(m_paletteConnection); | 175 | disconnect(m_paletteConnection); | ||
176 | } | 176 | } | ||
177 | m_decoration = decoration; | 177 | m_decoration = decoration; | ||
178 | connect(m_decoration->client().data(), &KDecoration2::DecoratedClient::activeChanged, this, &DecorationOptions::slotActiveChanged); | 178 | connect(m_decoration->client().toStrongRef().data(), &KDecoration2::DecoratedClient::activeChanged, this, &DecorationOptions::slotActiveChanged); | ||
179 | m_paletteConnection = connect(m_decoration->client().data(), &KDecoration2::DecoratedClient::paletteChanged, this, | 179 | m_paletteConnection = connect(m_decoration->client().toStrongRef().data(), &KDecoration2::DecoratedClient::paletteChanged, this, | ||
180 | [this] (const QPalette &pal) { | 180 | [this] (const QPalette &pal) { | ||
181 | m_colors.update(pal); | 181 | m_colors.update(pal); | ||
182 | emit colorsChanged(); | 182 | emit colorsChanged(); | ||
183 | } | 183 | } | ||
184 | ); | 184 | ); | ||
185 | auto s = m_decoration->settings(); | 185 | auto s = m_decoration->settings(); | ||
186 | connect(s.data(), &KDecoration2::DecorationSettings::fontChanged, this, &DecorationOptions::fontChanged); | 186 | connect(s.data(), &KDecoration2::DecorationSettings::fontChanged, this, &DecorationOptions::fontChanged); | ||
187 | connect(s.data(), &KDecoration2::DecorationSettings::decorationButtonsLeftChanged, this, &DecorationOptions::titleButtonsChanged); | 187 | connect(s.data(), &KDecoration2::DecorationSettings::decorationButtonsLeftChanged, this, &DecorationOptions::titleButtonsChanged); | ||
188 | connect(s.data(), &KDecoration2::DecorationSettings::decorationButtonsRightChanged, this, &DecorationOptions::titleButtonsChanged); | 188 | connect(s.data(), &KDecoration2::DecorationSettings::decorationButtonsRightChanged, this, &DecorationOptions::titleButtonsChanged); | ||
189 | emit decorationChanged(); | 189 | emit decorationChanged(); | ||
190 | } | 190 | } | ||
191 | 191 | | |||
192 | void DecorationOptions::slotActiveChanged() | 192 | void DecorationOptions::slotActiveChanged() | ||
193 | { | 193 | { | ||
194 | if (!m_decoration) { | 194 | if (!m_decoration) { | ||
195 | return; | 195 | return; | ||
196 | } | 196 | } | ||
197 | if (m_active == m_decoration->client().data()->isActive()) { | 197 | if (m_active == m_decoration->client().toStrongRef().data()->isActive()) { | ||
198 | return; | 198 | return; | ||
199 | } | 199 | } | ||
200 | m_active = m_decoration->client().data()->isActive(); | 200 | m_active = m_decoration->client().toStrongRef().data()->isActive(); | ||
201 | emit colorsChanged(); | 201 | emit colorsChanged(); | ||
202 | emit fontChanged(); | 202 | emit fontChanged(); | ||
203 | } | 203 | } | ||
204 | 204 | | |||
205 | int DecorationOptions::mousePressAndHoldInterval() const | 205 | int DecorationOptions::mousePressAndHoldInterval() const | ||
206 | { | 206 | { | ||
207 | return QGuiApplication::styleHints()->mousePressAndHoldInterval(); | 207 | return QGuiApplication::styleHints()->mousePressAndHoldInterval(); | ||
208 | } | 208 | } | ||
▲ Show 20 Lines • Show All 61 Lines • Show Last 20 Lines |