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

Merge branch 'Plasma/5.12'

Browse source
This commit is contained in:
Martin Flöser 2018-01-15 17:13:44 +01:00
commit 434a657234
3 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
effects/blur/CMakeLists.txt
View file

@ -12,6 +12,7 @@ target_link_libraries(kwin_blur_config
KF5::ConfigWidgets
KF5::I18n
KF5::Service
KF5::WindowSystem
)
kcoreaddons_desktop_to_json(kwin_blur_config blur_config.desktop SERVICE_TYPES kcmodule.desktop)

2
effects/blur/blur.cpp
View file

@ -118,7 +118,7 @@ void BlurEffect::reconfigure(ReconfigureFlags flags)
if (shader)
shader->setRadius(radius);
m_shouldCache = BlurConfig::cacheTexture();
m_shouldCache = effects->waylandDisplay() ? false : BlurConfig::cacheTexture();
windows.clear();

4
effects/blur/blur_config.cpp
View file

@ -25,6 +25,7 @@
#include <kwineffects_interface.h>
#include <KAboutData>
#include <KPluginFactory>
#include <KWindowSystem>
K_PLUGIN_FACTORY_WITH_JSON(BlurEffectConfigFactory,
"blur_config.json",
@ -37,6 +38,9 @@ BlurEffectConfig::BlurEffectConfig(QWidget *parent, const QVariantList &args)
: KCModule(KAboutData::pluginData(QStringLiteral("blur")), parent, args)
{
ui.setupUi(this);
if (KWindowSystem::isPlatformWayland()) {
ui.kcfg_CacheTexture->setVisible(false);
}
BlurConfig::instance(KWIN_CONFIG);
addConfig(BlurConfig::self(), this);