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

Fix condition for making themes configurable

Browse source 
KPluginMetaData::findPlugins only returns valid json metdata, the previous
check was accidentally kept for the condition that the plugin provides a theme engine.

BUG: 442978
FIXED-IN: master
This commit is contained in:
Alexander Lohnau 2021-09-28 20:05:34 +02:00 committed by Nate Graham
parent 6ca530e02b
commit 1022ce0036
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/kcmkwin/kwindecoration/decorationmodel.cpp
View file

@ -124,8 +124,8 @@ void DecorationsModel::init()
QScopedPointer<KDecoration2::DecorationThemeProvider> themeFinder( QScopedPointer<KDecoration2::DecorationThemeProvider> themeFinder(
KPluginFactory::instantiatePlugin<KDecoration2::DecorationThemeProvider>(info).plugin); KPluginFactory::instantiatePlugin<KDecoration2::DecorationThemeProvider>(info).plugin);
KDecoration2::DecorationThemeMetaData data; KDecoration2::DecorationThemeMetaData data;
const auto decoSettingsMap = info.rawData().value("org.kde.kdecoration2").toObject().toVariantMap();
if (themeFinder) { if (themeFinder) {
const auto decoSettingsMap = info.rawData().value("org.kde.kdecoration2").toObject().toVariantMap();
const QString &kns = findKNewStuff(decoSettingsMap); const QString &kns = findKNewStuff(decoSettingsMap);
if (!kns.isEmpty() && !m_knsProviders.contains(kns)) { if (!kns.isEmpty() && !m_knsProviders.contains(kns)) {
m_knsProviders.append(kns); m_knsProviders.append(kns);
@ -144,9 +144,9 @@ void DecorationsModel::init()
// it's a theme engine, we don't want to show this entry // it's a theme engine, we don't want to show this entry
continue; continue;
} }
data.setHasConfiguration(isConfigureable(decoSettingsMap));
data.setBorderSize(recommendedBorderSize(decoSettingsMap));
} }
data.setHasConfiguration(isConfigureable(decoSettingsMap));
data.setBorderSize(recommendedBorderSize(decoSettingsMap));
data.setVisibleName(info.name().isEmpty() ? info.pluginId() : info.name()); data.setVisibleName(info.name().isEmpty() ? info.pluginId() : info.name());
data.setPluginId(info.pluginId()); data.setPluginId(info.pluginId());
data.setThemeName(data.visibleName()); data.setThemeName(data.visibleName());