From c4eccab84ae8d2864222dd3550d061be543eeda4 Mon Sep 17 00:00:00 2001
From: Souris-2d07 <55772-souris@users.noreply.gitgud.io>
Date: Sat, 2 Mar 2024 09:15:28 +1030
Subject: [PATCH] kwin_fixblur: Fix config for SVG location
Both the kwin_fixblur and kwin_reflect effects would read from the same key value if a custom reflection texture or SVG mask was set.
The kwin_fixblur effect will now use "SvgLocation" instead of "TextureLocation".
---
KWin/kwin_fixblur/src/blur.cpp | 2 +-
KWin/kwin_fixblur/src/blur.kcfg | 2 +-
KWin/kwin_fixblur/src/kcm/blur_config.cpp | 4 ++--
KWin/kwin_fixblur/src/kcm/blur_config.ui | 2 +-
4 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/KWin/kwin_fixblur/src/blur.cpp b/KWin/kwin_fixblur/src/blur.cpp
index 6d0ef49..effa0e5 100644
--- a/KWin/kwin_fixblur/src/blur.cpp
+++ b/KWin/kwin_fixblur/src/blur.cpp
@@ -86,7 +86,7 @@ void BlurEffect::reconfigure(ReconfigureFlags flags)
BlurConfig::self()->read();
m_includedWindows = BlurConfig::includedWindows().split(';');
- m_texturePath = BlurConfig::textureLocation();
+ m_texturePath = BlurConfig::svgLocation();
updateTexture();
updateAllWindows();
effects->addRepaintFull();
diff --git a/KWin/kwin_fixblur/src/blur.kcfg b/KWin/kwin_fixblur/src/blur.kcfg
index cd3f138..68d96c3 100755
--- a/KWin/kwin_fixblur/src/blur.kcfg
+++ b/KWin/kwin_fixblur/src/blur.kcfg
@@ -6,7 +6,7 @@
-
+
diff --git a/KWin/kwin_fixblur/src/kcm/blur_config.cpp b/KWin/kwin_fixblur/src/kcm/blur_config.cpp
index 4cc30fe..2df9eb2 100755
--- a/KWin/kwin_fixblur/src/kcm/blur_config.cpp
+++ b/KWin/kwin_fixblur/src/kcm/blur_config.cpp
@@ -46,13 +46,13 @@ BlurEffectConfig::BlurEffectConfig(QWidget *parent, const QVariantList &args)
void BlurEffectConfig::clearTexturePath()
{
- ui.kcfg_TextureLocation->setText("");
+ ui.kcfg_SvgLocation->setText("");
}
void BlurEffectConfig::setTexturePath()
{
if(m_dialog->exec())
{
- ui.kcfg_TextureLocation->setText(m_dialog->selectedFiles()[0]);
+ ui.kcfg_SvgLocation->setText(m_dialog->selectedFiles()[0]);
}
}
diff --git a/KWin/kwin_fixblur/src/kcm/blur_config.ui b/KWin/kwin_fixblur/src/kcm/blur_config.ui
index 3e847b8..e7f28fe 100755
--- a/KWin/kwin_fixblur/src/kcm/blur_config.ui
+++ b/KWin/kwin_fixblur/src/kcm/blur_config.ui
@@ -46,7 +46,7 @@
-
-
-
+
true