Merge lp:~smspillaz/compiz-core/compiz-core.fix_987639 into lp:compiz-core/0.9.8

[Sam Spilsbury]

== Problem ==

See LP#987639 - decorations would be clipped by paint region but this is incorrect

== Solution ==

Checked with older versions, they should indeed always use infiniteRegion in the case of transformed windows.

== test ==

Already covered.

[Alan Griffiths (alan-griffiths)]

LGTM

review: Approve

[Daniel van Vugt (vanvugt)]

Looks OK, and confirmed the fix works.

review: Approve

=== modified file 'plugins/decor/src/decor.cpp'
--- plugins/decor/src/decor.cpp	2012-04-23 05:36:16 +0000
+++ plugins/decor/src/decor.cpp	2012-04-24 14:37:25 +0000
@@ -223,31 +223,28 @@
 
 	const CompRegion *preg = NULL;
 
-	if (mClipGroup)
+	if ((mask & (PAINT_WINDOW_ON_TRANSFORMED_SCREEN_MASK |
+		     PAINT_WINDOW_WITH_OFFSET_MASK)))
+	    preg = &region;
+	else if (mask & PAINT_WINDOW_TRANSFORMED_MASK)
+	    preg = &infiniteRegion;
+	else if (mClipGroup)
 	{
-	    if ((mask & (PAINT_WINDOW_ON_TRANSFORMED_SCREEN_MASK |
-			 PAINT_WINDOW_WITH_OFFSET_MASK)))
+	    tmpRegion = mOutputRegion;
+	    tmpRegion &= region;
+
+	    if (tmpRegion.isEmpty ())
 		preg = &region;
-	    else if (mask & PAINT_WINDOW_TRANSFORMED_MASK)
-		preg = &infiniteRegion;
 	    else
-	    {
-		tmpRegion = mOutputRegion;
-		tmpRegion &= region;
-
-		if (tmpRegion.isEmpty ())
-		    preg = &region;
-		else
-		    preg = &shadowRegion;
-	    }
-
-	    /* In case some plugin needs to paint us with an offset region */
-	    if (preg->isEmpty ())
-		preg = &region;
+		preg = &shadowRegion;
 	}
 	else
 	    preg = &region;
 
+	/* In case some plugin needs to paint us with an offset region */
+	if (preg->isEmpty ())
+	    preg = &region;
+
 	const CompRegion &reg (*preg);
 
 	gWindow->geometry ().reset ();