wilderjds
/
kwin
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[kcmkwin] Properly load effects

Browse Source 
Summary:
EffectsModel has to communicate with KWin in order to receive the
actual value of SupportedRole. So, in theory the model should notify
about loaded effects after receiving response from KWin, but that's
not the case.

Test Plan: Desktop Effects KCM no longer flashes when resetting changes.

Reviewers: #kwin, davidedmundson

Reviewed By: #kwin, davidedmundson

Subscribers: kwin

Tags: #kwin

Differential Revision: https://phabricator.kde.org/D18728
remotes/offline-stg/wilder
Vlad Zagorodniy 7 years ago
parent dc0b11eea7
commit 56b24f959f
3 changed files with 93 additions and 57 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 132
      kcmkwin/common/effectsmodel.cpp
  2. 10
      kcmkwin/common/effectsmodel.h
  3. 8
      kcmkwin/kwindesktop/animationsmodel.cpp

132
kcmkwin/common/effectsmodel.cpp
Unescape View File

@ -269,7 +269,7 @@ void EffectsModel::loadBuiltInEffects(const KConfigGroup &kwinConfig, const KPlu
);
if (shouldStore(effect)) {
m_effects << effect;
m_pendingEffects << effect;
}
}
}
@ -314,7 +314,7 @@ void EffectsModel::loadJavascriptEffects(const KConfigGroup &kwinConfig)
}
if (shouldStore(effect)) {
m_effects << effect;
m_pendingEffects << effect;
}
}
}
@ -382,7 +382,7 @@ void EffectsModel::loadPluginEffects(const KConfigGroup &kwinConfig, const KPlug
);
if (shouldStore(effect)) {
m_effects << effect;
m_pendingEffects << effect;
}
}
}
@ -391,42 +391,50 @@ void EffectsModel::load(LoadOptions options)
{
KConfigGroup kwinConfig(KSharedConfig::openConfig("kwinrc"), "Plugins");
const QVector<EffectData> oldEffects = m_effects;
beginResetModel();
m_effects.clear();
m_pendingEffects.clear();
const KPluginInfo::List configs = KPluginTrader::self()->query(QStringLiteral("kwin/effects/configs/"));
loadBuiltInEffects(kwinConfig, configs);
loadJavascriptEffects(kwinConfig);
loadPluginEffects(kwinConfig, configs);
if (options == LoadOptions::KeepDirty) {
for (const EffectData &oldEffect : oldEffects) {
if (!oldEffect.changed) {
continue;
}
auto effectIt = std::find_if(m_effects.begin(), m_effects.end(),
[serviceName = oldEffect.serviceName](const EffectData &data) {
return data.serviceName == serviceName;
qSort(m_pendingEffects.begin(), m_pendingEffects.end(),
[](const EffectData &a, const EffectData &b) {
if (a.category == b.category) {
if (a.exclusiveGroup == b.exclusiveGroup) {
return a.name < b.name;
}
);
if (effectIt == m_effects.end()) {
continue;
return a.exclusiveGroup < b.exclusiveGroup;
}
effectIt->status = oldEffect.status;
effectIt->changed = effectIt->status != effectIt->originalStatus;
return a.category < b.category;
}
}
);
qSort(m_effects.begin(), m_effects.end(), [](const EffectData &a, const EffectData &b) {
if (a.category == b.category) {
if (a.exclusiveGroup == b.exclusiveGroup) {
return a.name < b.name;
auto commit = [this, options] {
if (options == LoadOptions::KeepDirty) {
for (const EffectData &oldEffect : m_effects) {
if (!oldEffect.changed) {
continue;
}
auto effectIt = std::find_if(m_pendingEffects.begin(), m_pendingEffects.end(),
[oldEffect](const EffectData &data) {
return data.serviceName == oldEffect.serviceName;
}
);
if (effectIt == m_pendingEffects.end()) {
continue;
}
effectIt->status = oldEffect.status;
effectIt->changed = effectIt->status != effectIt->originalStatus;
}
return a.exclusiveGroup < b.exclusiveGroup;
}
return a.category < b.category;
});
beginResetModel();
m_effects = m_pendingEffects;
m_pendingEffects.clear();
endResetModel();
emit loaded();
};
OrgKdeKwinEffectsInterface interface(QStringLiteral("org.kde.KWin"),
QStringLiteral("/Effects"),
@ -434,43 +442,57 @@ void EffectsModel::load(LoadOptions options)
if (interface.isValid()) {
QStringList effectNames;
effectNames.reserve(m_effects.count());
for (const EffectData &data : m_effects) {
effectNames.reserve(m_pendingEffects.count());
for (const EffectData &data : m_pendingEffects) {
effectNames.append(data.serviceName);
}
const int serial = ++m_lastSerial;
QDBusPendingCallWatcher *watcher = new QDBusPendingCallWatcher(interface.areEffectsSupported(effectNames), this);
watcher->setProperty("effectNames", effectNames);
connect(watcher, &QDBusPendingCallWatcher::finished, [this](QDBusPendingCallWatcher *self) {
const QStringList effectNames = self->property("effectNames").toStringList();
const QDBusPendingReply<QList<bool > > reply = *self;
QList<bool> supportValues;
if (reply.isValid()) {
supportValues.append(reply.value());
}
if (effectNames.size() == supportValues.size()) {
connect(watcher, &QDBusPendingCallWatcher::finished, this,
[=](QDBusPendingCallWatcher *self) {
self->deleteLater();
if (m_lastSerial != serial) {
return;
}
const QDBusPendingReply<QList<bool > > reply = *self;
if (reply.isError()) {
commit();
return;
}
const QList<bool> supportedValues = reply.value();
if (supportedValues.count() != effectNames.count()) {
return;
}
for (int i = 0; i < effectNames.size(); ++i) {
const bool supportedValue = supportValues.at(i);
const QString &effectName = effectNames.at(i);
auto it = std::find_if(m_effects.begin(), m_effects.end(), [effectName](const EffectData &data) {
return data.serviceName == effectName;
});
if (it != m_effects.end()) {
if ((*it).supported != supportedValue) {
(*it).supported = supportedValue;
QModelIndex i = findByPluginId(effectName);
if (i.isValid()) {
emit dataChanged(i, i, QVector<int>() << SupportedRole);
}
const bool supported = supportedValues.at(i);
const QString effectName = effectNames.at(i);
auto it = std::find_if(m_pendingEffects.begin(), m_pendingEffects.end(),
[effectName](const EffectData &data) {
return data.serviceName == effectName;
}
);
if (it == m_pendingEffects.end()) {
continue;
}
if ((*it).supported != supported) {
(*it).supported = supported;
}
}
commit();
}
self->deleteLater();
});
);
} else {
commit();
}
endResetModel();
}
void EffectsModel::updateEffectStatus(const QModelIndex &rowIndex, Status effectState)

10
kcmkwin/common/effectsmodel.h
Unescape View File

@ -207,6 +207,14 @@ public:
**/
void requestConfigure(const QModelIndex &index, QWindow *transientParent);
Q_SIGNALS:
/**
* This signal is emitted when the model is loaded or reloaded.
*
* @see load
**/
void loaded();
protected:
enum class Kind {
BuiltIn,
@ -253,6 +261,8 @@ private:
void loadPluginEffects(const KConfigGroup &kwinConfig, const KPluginInfo::List &configs);
QVector<EffectData> m_effects;
QVector<EffectData> m_pendingEffects;
int m_lastSerial = -1;
Q_DISABLE_COPY(EffectsModel)
};

8
kcmkwin/kwindesktop/animationsmodel.cpp
Unescape View File

@ -26,6 +26,12 @@ namespace KWin
AnimationsModel::AnimationsModel(QObject *parent)
: EffectsModel(parent)
{
connect(this, &EffectsModel::loaded, this,
[this] {
setEnabled(modelCurrentEnabled());
setCurrentIndex(modelCurrentIndex());
}
);
connect(this, &AnimationsModel::currentIndexChanged, this,
[this] {
const QModelIndex index_ = index(m_currentIndex, 0);
@ -108,8 +114,6 @@ int AnimationsModel::modelCurrentIndex() const
void AnimationsModel::load()
{
EffectsModel::load();
setEnabled(modelCurrentEnabled());
setCurrentIndex(modelCurrentIndex());
}
void AnimationsModel::save()

Write Preview
Loading…
Cancel
Save