From 63f6d22f47e1468ba2fb9f79e71ac8ce796969c4 Mon Sep 17 00:00:00 2001
From: Michail Vourlakos <mvourlakos@gmail.com>
Date: Thu, 16 Jan 2020 19:26:54 +0200
Subject: [PATCH] dont update dock settings mask for compositing

--follow PlasmaQuick::Dialog:Popup window approach
and dont apply any mask when compositing is active
---
 app/view/settings/primaryconfigview.cpp   |  9 +++++++--
 app/view/settings/secondaryconfigview.cpp | 10 +++++++---
 2 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/app/view/settings/primaryconfigview.cpp b/app/view/settings/primaryconfigview.cpp
index a6de1f377..d4a83c67f 100644
--- a/app/view/settings/primaryconfigview.cpp
+++ b/app/view/settings/primaryconfigview.cpp
@@ -726,10 +726,15 @@ void PrimaryConfigView::updateEffects()
     }
 
     if (!mask.isEmpty()) {
-        setMask(mask);
+        if (KWindowSystem::compositingActive()) {
+            setMask(QRegion());
+        } else {
+            setMask(mask);
+        }
+
         KWindowEffects::enableBlurBehind(winId(), true, mask);
     } else {
-        setMask(QRect());
+        setMask(QRegion());
         KWindowEffects::enableBlurBehind(winId(), false);
     }
 }
diff --git a/app/view/settings/secondaryconfigview.cpp b/app/view/settings/secondaryconfigview.cpp
index 5b3422da3..b2f60efb0 100644
--- a/app/view/settings/secondaryconfigview.cpp
+++ b/app/view/settings/secondaryconfigview.cpp
@@ -421,16 +421,20 @@ void SecondaryConfigView::updateEffects()
     if (rootObject) {
         const QVariant maskProperty = rootObject->property("backgroundMask");
         if (static_cast<QMetaType::Type>(maskProperty.type()) == QMetaType::QRegion) {
-            qDebug() << "found 2...";
             mask = maskProperty.value<QRegion>();
         }
     }
 
     if (!mask.isEmpty()) {
-        setMask(mask);
+        if (KWindowSystem::compositingActive()) {
+            setMask(QRegion());
+        } else {
+            setMask(mask);
+        }
+
         KWindowEffects::enableBlurBehind(winId(), true, mask);
     } else {
-        setMask(QRect());
+        setMask(QRegion());
         KWindowEffects::enableBlurBehind(winId(), false);
     }
 }