Merge lp:~townsend/compiz/fix-expo-maximized-window-gap into lp:compiz/0.9.11

[Christopher Townsend]

Fixes issue in the Expo plugin where a gap is shown in the place where the Launcher and Panel should be when windows are maximized. This was originally removed in rev. 3481.

Fixes issue in the Expo plugin where a gap is shown in the place where the Launcher and Panel should be when windows are maximized. This was originally removed in rev. 3481.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:3861
http://jenkins.qa.ubuntu.com/job/compiz-0.9.11-ci/77/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/compiz-0.9.11-utopic-amd64-ci/5
    SUCCESS: http://jenkins.qa.ubuntu.com/job/compiz-0.9.11-utopic-armhf-ci/5
    SUCCESS: http://jenkins.qa.ubuntu.com/job/compiz-0.9.11-utopic-i386-ci/5

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/compiz-0.9.11-ci/77/rebuild

review: Approve (continuous-integration)

[lp:~townsend/compiz/fix-expo-maximized-window-gap]

3862. By Christopher Townsend on 2014-06-05

Only check if the window is fully maximized when stretching it out to account for the Launcher and Panel.

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

Cool, thanks!

review: Approve

=== modified file 'plugins/expo/src/expo.cpp'
--- plugins/expo/src/expo.cpp	2013-07-14 10:38:09 +0000
+++ plugins/expo/src/expo.cpp	2014-06-05 13:18:27 +0000
@@ -1461,6 +1461,9 @@
 		     const CompRegion          &region,
 		     unsigned int              mask)
 {
+    GLMatrix            wTransform (transform);
+    GLWindowPaintAttrib wAttrib (attrib);
+
     if (eScreen->expoActive)
     {
 	if (eScreen->expoCam > 0.0)
@@ -1471,6 +1474,8 @@
 			 ExpoScreen::ExpoAnimationZoom;
 	bool  hide     = eScreen->optionGetHideDocks () &&
 			 (window->wmType () & CompWindowTypeDockMask);
+	CompPoint vp;
+	screen->viewportForGeometry (window->geometry (), vp);
 
 	if (!zoomAnim)
 	    opacity = attrib.opacity * eScreen->expoCam;
@@ -1486,9 +1491,30 @@
 
 	if (opacity <= 0)
 	    mask |= PAINT_WINDOW_NO_CORE_INSTANCE_MASK;
+
+	/* Stretch maximized windows a little so that you don't
+	 * have an awkward gap */
+	if ((window->state () & MAXIMIZE_STATE) == MAXIMIZE_STATE)
+	{
+	    CompOutput *o = &screen->outputDevs ()[screen->outputDeviceForGeometry(window->geometry())];
+	    float yS = 1.0 + ((o->height () / (float) window->height ()) - 1.0f) * sigmoidProgress (eScreen->expoCam);
+	    float xS = 1.0 + ((o->width () / (float) window->width ()) - 1.0f) * sigmoidProgress (eScreen->expoCam);
+	    wTransform.translate (window->x () + window->width (),
+				  window->y () + window->height (),
+				  0.0f);
+	    wTransform.scale (xS, yS, 1.0f);
+	    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 (attrib, transform, region, mask);
+    return gWindow->glPaint (wAttrib, wTransform, region, mask);
 }
 
 bool