From f024efed28fc8b3497ed7345dfb98ab484226136 Mon Sep 17 00:00:00 2001
From: Lucas Murray <lmurray@undefinedfire.com>
Date: Tue, 16 Jun 2009 14:09:47 +0000
Subject: [PATCH] Sync r982638 from Oxygen.

svn path=/trunk/KDE/kdebase/workspace/; revision=982640
---
 clients/ozone/oxygenclient.cpp | 25 ++++++++++++-------------
 1 file changed, 12 insertions(+), 13 deletions(-)

diff --git a/clients/ozone/oxygenclient.cpp b/clients/ozone/oxygenclient.cpp
index 2f87de5294..2b201efa58 100644
--- a/clients/ozone/oxygenclient.cpp
+++ b/clients/ozone/oxygenclient.cpp
@@ -470,24 +470,23 @@ void OxygenClient::drawStripes(QPainter *p, QPalette &palette, const int start,
 void OxygenClient::updateWindowShape()
 {
     bool maximized = maximizeMode()==MaximizeFull && !options()->moveResizeMaximizedWindows();
-    int w=widget()->width() - (int)SHADOW_WIDTH;
-    int h=widget()->height() - (int)SHADOW_WIDTH;
 
-    if(maximized) {
-        QRegion mask(0,0,w,h);
-        setMask(mask);
+    if(maximized || compositingActive()) {
+        clearMask();
         return;
     }
 
-    if (!compositingActive()) {
-        int sw = SHADOW_WIDTH;
-        QRegion mask(sw+4, sw+0, -sw+w-8, -sw+h);
-        mask += QRegion(sw+0, sw+4, -sw+w, -sw+h-8);
-        mask += QRegion(sw+2, sw+1, -sw+w-4, -sw+h-2);
-        mask += QRegion(sw+1, sw+2, -sw+w-2, -sw+h-4);
+    int w=widget()->width() - (int)SHADOW_WIDTH;
+    int h=widget()->height() - (int)SHADOW_WIDTH;
 
-        setMask(mask);
-    }
+    // set a mask if compositing is not active
+    int sw = SHADOW_WIDTH;
+    QRegion mask(sw+4, sw+0, -sw+w-8, -sw+h);
+    mask += QRegion(sw+0, sw+4, -sw+w, -sw+h-8);
+    mask += QRegion(sw+2, sw+1, -sw+w-4, -sw+h-2);
+    mask += QRegion(sw+1, sw+2, -sw+w-2, -sw+h-4);
+
+    setMask(mask);
 }
 
 TileSet *OxygenClient::shadowTiles(const QColor& color, const QColor& glow, qreal size, bool active)