Merge lp:~townsend/compiz/fix-lp1333277 into lp:compiz/0.9.12

[Christopher Townsend]

Remove the need to check the viewport we are painting the maximized window in while in Expo mode and only scale maximized windows that are not being dragged. Fixes a regression caused in r3868.

Remove the need to check the viewport we are painting the maximized window in while in Expo mode and only scale maximized windows that aren't being dragged. This is done because it is too tricky to paint the scaled window and get the Expo wall borders correctly.

Fixes a regression caused in r3868.

To test:
1. Open a maximized window.
2. Invoke Expo.
3. Move maximized window to another workspace while in Expo.

Note that the maximized window will go back to it's original size while being dragged. I think this OK because this is not causing a regression since this is what it looked like previously.

[Marco Trevisan (Treviño) (3v1n0)]

This looks fine to me, but I'm not getting the maximized window to be restored while dragged here... mhmh

[Marco Trevisan (Treviño) (3v1n0)]

review: Approve

=== modified file 'plugins/expo/src/expo.cpp'
--- plugins/expo/src/expo.cpp	2014-06-05 13:17:05 +0000
+++ plugins/expo/src/expo.cpp	2014-06-24 18:41:45 +0000
@@ -1462,7 +1462,6 @@
 		     unsigned int              mask)
 {
     GLMatrix            wTransform (transform);
-    GLWindowPaintAttrib wAttrib (attrib);
 
     if (eScreen->expoActive)
     {
@@ -1474,8 +1473,6 @@
 			 ExpoScreen::ExpoAnimationZoom;
 	bool  hide     = eScreen->optionGetHideDocks () &&
 			 (window->wmType () & CompWindowTypeDockMask);
-	CompPoint vp;
-	screen->viewportForGeometry (window->geometry (), vp);
 
 	if (!zoomAnim)
 	    opacity = attrib.opacity * eScreen->expoCam;
@@ -1494,7 +1491,8 @@
 
 	/* Stretch maximized windows a little so that you don't
 	 * have an awkward gap */
-	if ((window->state () & MAXIMIZE_STATE) == MAXIMIZE_STATE)
+	if (((window->state () & MAXIMIZE_STATE) == MAXIMIZE_STATE) &&
+	    (eScreen->dndWindow != window))
 	{
 	    CompOutput *o = &screen->outputDevs ()[screen->outputDeviceForGeometry(window->geometry())];
 	    float yS = 1.0 + ((o->height () / (float) window->height ()) - 1.0f) * sigmoidProgress (eScreen->expoCam);
@@ -1506,15 +1504,10 @@
 	    wTransform.translate (-(window->x () + window->width ()),
 				  -(window->y () + window->height ()),
 				  0.0f);
-
-	    if (eScreen->paintingVp != vp)
-		mask |= PAINT_WINDOW_NO_CORE_INSTANCE_MASK;
-
-	    mask |= PAINT_WINDOW_TRANSFORMED_MASK;
 	}
     }
 
-    return gWindow->glPaint (wAttrib, wTransform, region, mask);
+    return gWindow->glPaint (attrib, wTransform, region, mask);
 }
 
 bool