Fix condition for making themes configurable
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:
parent
6ca530e02b
commit
1022ce0036
1 changed files with 3 additions and 3 deletions
|
@ -124,8 +124,8 @@ void DecorationsModel::init()
|
|||
QScopedPointer<KDecoration2::DecorationThemeProvider> themeFinder(
|
||||
KPluginFactory::instantiatePlugin<KDecoration2::DecorationThemeProvider>(info).plugin);
|
||||
KDecoration2::DecorationThemeMetaData data;
|
||||
if (themeFinder) {
|
||||
const auto decoSettingsMap = info.rawData().value("org.kde.kdecoration2").toObject().toVariantMap();
|
||||
if (themeFinder) {
|
||||
const QString &kns = findKNewStuff(decoSettingsMap);
|
||||
if (!kns.isEmpty() && !m_knsProviders.contains(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
|
||||
continue;
|
||||
}
|
||||
}
|
||||
data.setHasConfiguration(isConfigureable(decoSettingsMap));
|
||||
data.setBorderSize(recommendedBorderSize(decoSettingsMap));
|
||||
}
|
||||
data.setVisibleName(info.name().isEmpty() ? info.pluginId() : info.name());
|
||||
data.setPluginId(info.pluginId());
|
||||
data.setThemeName(data.visibleName());
|
||||
|
|
Loading…
Reference in a new issue