Merge lp:~feng-kylin/compiz/fix_gap_on_bottom into lp:compiz/0.9.12

[handsome_feng]

Add a YBottomOffset value when stretch maximized windows。

Add YBottomOffset so that you don't have an awkward gap。

[Sam Spilsbury (smspillaz)]

Theoretically there's nothing wrong here. I question whether it would be better to have these as internal options configured by the unityshell plugin itself as opposed to user-facing ones.

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

> Theoretically there's nothing wrong here. I question whether it would be
> better to have these as internal options configured by the unityshell plugin
> itself as opposed to user-facing ones.

Yeah, i quite agree... You could just keep the options private. Although it's not an huge problem.

Once you've fixed things as per inline comments, we're good to go.

[lp:~feng-kylin/compiz/fix_gap_on_bottom]

4013. By handsome_feng on 2016-05-16

fix indentation and workArea.setBottom

[handsome_feng (feng-kylin)]

Sam, Marco, Thanks for your suggestions. I have update the branch according to
the comments, but how to keep the options private ?

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

review: Approve

=== modified file 'plugins/expo/expo.xml.in'
--- plugins/expo/expo.xml.in	2015-10-26 17:15:43 +0000
+++ plugins/expo/expo.xml.in	2016-05-16 06:27:27 +0000
@@ -149,6 +149,12 @@
 		    <_long>Vertical offset (in pixels).</_long>
 		    <default>24</default>
 		</option>
+		<option name="y_bottom_offset" type="int">
+		    <_short>Y Bottom Offset</_short>
+		    <_long>Vertical offset from the bottom (in pixels).</_long>
+		    <default>0</default>
+		    <min>0</min>
+		</option>
 		<option name="distance" type="float">
 		    <_short>Camera Distance</_short>
 		    <_long>The distance between the camera and the exposed viewports.</_long>

=== modified file 'plugins/expo/src/expo.cpp'
--- plugins/expo/src/expo.cpp	2015-10-20 15:12:34 +0000
+++ plugins/expo/src/expo.cpp	2016-05-16 06:27:27 +0000
@@ -921,6 +921,8 @@
     /* translate expo to center */
     sTransform.translate (vpSize.x () * sx * -0.5 + offsetInWorldCoordX,
 			  vpSize.y () * sy *  0.5 - offsetInWorldCoordY, 0.0f);
+
+    worldScaleFactorY -= (float)optionGetYBottomOffset () / (float)output->height ();
     sTransform.scale (worldScaleFactorX, worldScaleFactorY, 1.0f);
 
 
@@ -1503,7 +1505,7 @@
 	    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 (),
+				  window->y () + window->height () + eScreen->optionGetYBottomOffset (),
 				  0.0f);
 	    wTransform.scale (xS, yS, 1.0f);
 	    wTransform.translate (-(window->x () + window->width ()),

=== modified file 'plugins/scale/include/scale/scale.h'
--- plugins/scale/include/scale/scale.h	2014-04-15 16:47:09 +0000
+++ plugins/scale/include/scale/scale.h	2016-05-16 06:27:27 +0000
@@ -137,7 +137,7 @@
     public:
 	ScaleWindow (CompWindow *w);
 	~ScaleWindow ();
-	
+
 	CompWindow	*window;
 
 	bool hasSlot () const;

=== modified file 'plugins/scale/scale.xml.in'
--- plugins/scale/scale.xml.in	2015-10-26 17:15:43 +0000
+++ plugins/scale/scale.xml.in	2016-05-16 06:27:27 +0000
@@ -33,7 +33,13 @@
 			</option>
 			<option name="y_offset" type="int">
 				<_short>Y Offset</_short>
-				<_long>Vertical offset (in pixels).</_long>
+				<_long>Vertical offset from the top (in pixels).</_long>
+				<min>0</min>
+				<default>0</default>
+			</option>
+			<option name="y_bottom_offset" type="int">
+				<_short>Y Bottom Offset</_short>
+				<_long>Vertical offset from the bottom (in pixels).</_long>)
 				<min>0</min>
 				<default>0</default>
 			</option>

=== modified file 'plugins/scale/src/scale.cpp'
--- plugins/scale/src/scale.cpp	2015-11-16 12:14:14 +0000
+++ plugins/scale/src/scale.cpp	2016-05-16 06:27:27 +0000
@@ -509,7 +509,7 @@
     int nSlots  = 0;
 
     y      = optionGetYOffset() + workArea.y () + spacing;
-    height = (workArea.height () - optionGetYOffset() - (lines + 1) * spacing) / lines;
+    height = (workArea.height () - optionGetYOffset () - optionGetYBottomOffset () - (lines + 1) * spacing) / lines;
 
     for (int i = 0; i < lines; i++)
     {
@@ -1752,6 +1752,7 @@
 		    CompRect  workArea (screen->currentOutputDev ().workArea ());
 		    workArea.setX (workArea.x() + optionGetXOffset ());
 		    workArea.setY (workArea.y() + optionGetYOffset ());
+		    workArea.setBottom (workArea.bottom () + optionGetYBottomOffset ());
 
 		    if (workArea.contains (pointer))
 		    {