From 71cf5a3e9a21cab430b080abbd2608c3da760b54 Mon Sep 17 00:00:00 2001
From: Marco Martin <notmart@gmail.com>
Date: Tue, 10 Jun 2014 15:22:12 +0200
Subject: [PATCH] set window mask when composite is off

---
 src/plasmaquick/dialog.cpp | 16 +++++++++++-----
 src/plasmaquick/dialog.h   |  2 +-
 2 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/src/plasmaquick/dialog.cpp b/src/plasmaquick/dialog.cpp
index ea6f68e3c..df9bcc8cb 100644
--- a/src/plasmaquick/dialog.cpp
+++ b/src/plasmaquick/dialog.cpp
@@ -75,7 +75,7 @@ public:
 
     //SLOTS
     void syncBorders();
-    void updateContrast();
+    void updateTheme();
     void updateVisibility(bool visible);
 
     void updateMinimumWidth();
@@ -170,13 +170,19 @@ void DialogPrivate::syncBorders()
     }
 }
 
-void DialogPrivate::updateContrast()
+void DialogPrivate::updateTheme()
 {
     KWindowEffects::enableBackgroundContrast(q->winId(), theme.backgroundContrastEnabled(),
             theme.backgroundContrast(),
             theme.backgroundIntensity(),
             theme.backgroundSaturation(),
             frameSvgItem->frameSvg()->mask());
+
+    if (KWindowSystem::compositingActive()) {
+        q->setMask(QRegion());
+    } else {
+        q->setMask(frameSvgItem->frameSvg()->mask());
+    }
 }
 
 void DialogPrivate::updateVisibility(bool visible)
@@ -355,7 +361,7 @@ void DialogPrivate::syncMainItemToSize()
     syncBorders();
 
     KWindowEffects::enableBlurBehind(q->winId(), true, frameSvgItem->frameSvg()->mask());
-    updateContrast();
+    updateTheme();
 
     if (mainItem) {
         mainItem.data()->setX(frameSvgItem->margins()->left());
@@ -402,7 +408,7 @@ void DialogPrivate::syncToMainItemSize()
     mainItem.data()->setX(frameSvgItem->margins()->left());
     mainItem.data()->setY(frameSvgItem->margins()->top());
     KWindowEffects::enableBlurBehind(q->winId(), true, frameSvgItem->frameSvg()->mask());
-    updateContrast();
+    updateTheme();
 }
 
 void DialogPrivate::requestSizeSync(bool delayed)
@@ -469,7 +475,7 @@ Dialog::Dialog(QQuickItem *parent)
     d->frameSvgItem->setImagePath("dialogs/background");
 
     connect(&d->theme, SIGNAL(themeChanged()),
-            this, SLOT(updateContrast()));
+            this, SLOT(updateTheme()));
 
 }
 
diff --git a/src/plasmaquick/dialog.h b/src/plasmaquick/dialog.h
index 400922278..927008d0a 100644
--- a/src/plasmaquick/dialog.h
+++ b/src/plasmaquick/dialog.h
@@ -196,7 +196,7 @@ private:
     DialogPrivate *const d;
 
     Q_PRIVATE_SLOT(d, void syncBorders())
-    Q_PRIVATE_SLOT(d, void updateContrast())
+    Q_PRIVATE_SLOT(d, void updateTheme())
     Q_PRIVATE_SLOT(d, void updateVisibility(bool visible))
     Q_PRIVATE_SLOT(d, void updateInputShape())