Merge lp:~hikiko/compiz/compiz.fix-expo-gap-bug into lp:compiz

[Eleni Maria Stea]

Related bug: https://bugs.launchpad.net/compiz/+bug/1611464 Expo plugin shows a gap when a window is maximised on the left (when the launcher is on the left) or at the bottom (when the launcher is at the bottom).

Change: Fixed the maximised window translations to take the offsets into account. Also fixed the progressive and wrong scaling of the maximised windows.

Related bug: https://bugs.launchpad.net/compiz/+bug/1611464 Expo plugin shows a gap when a window is maximised on the left (when the launcher is on the left) or at the bottom (when the launcher is at the bottom).

Change: Fixed the maximised window translations to take the offsets into account. Also fixed the progressive and wrong scaling of the maximised windows.

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

Things have improved on the bottom side...

There's a top issue though, the window top side should not be stretched up to the maximum, but it should respect the workarea x+height value.

See what I mean: https://vid.me/lTHe

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

I've tried again this, but it's still broken... Please give this a new look.

review: Needs Information

Unmerged revisions

4087. By Eleni Maria Stea on 2016-09-22

removed debugging printf

4086. By Eleni Maria Stea on 2016-09-22

fixed the gap on the top

4085. By Eleni Maria Stea on 2016-08-26

fixed maximized window gap transformations

=== modified file 'plugins/expo/src/expo.cpp'
--- plugins/expo/src/expo.cpp	2016-08-18 09:39:05 +0000
+++ plugins/expo/src/expo.cpp	2016-09-22 10:46:25 +0000
@@ -1519,15 +1519,19 @@
 	    (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);
-	    float xS = 1.0 + ((o->width () / (float) window->width ()) - 1.0f) * sigmoidProgress (eScreen->expoCam);
-	    wTransform.translate (window->x () + window->width (),
-				  window->y () + window->height () + eScreen->optionGetYBottomOffset (),
-				  0.0f);
+	    float xOffs = eScreen->optionGetXOffset ();
+	    float yOffs = eScreen->optionGetYOffset ();
+	    float yBottomOffs = eScreen->optionGetYBottomOffset ();
+
+	    float xS = o->width () / (o->width () - xOffs);
+	    float yS = o->height () / (o->height () - yOffs - yBottomOffs);
+
+	    float tx = window->x () - xOffs;
+	    float ty = window->y () - yOffs;
+
+	    wTransform.translate (tx, ty, 0.0f);
 	    wTransform.scale (xS, yS, 1.0f);
-	    wTransform.translate (-(window->x () + window->width ()),
-				  -(window->y () + window->height ()),
-				  0.0f);
+	    wTransform.translate (-window->x (), -window->y () + yOffs, 0.0f);
 	}
     }
 

=== modified file 'plugins/expo/src/wall_offset/src/wall-offset.cpp'
--- plugins/expo/src/wall_offset/src/wall-offset.cpp	2013-08-21 20:12:13 +0000
+++ plugins/expo/src/wall_offset/src/wall-offset.cpp	2016-09-22 10:46:25 +0000
@@ -32,7 +32,7 @@
 			     float	     &worldScaleFactorY,
 			     float           animationProgress)
 	{
-	    const float sx    = screenSize.width ()  / static_cast <float> (output.width ());
+	    const float sx    = screenSize.width () / static_cast <float> (output.width ());
 	    const float sy    = screenSize.height () / static_cast <float> (output.height ());
 	    offsetInWorldX    = 0.0;
 	    offsetInWorldY    = 0.0;