Merge lp:~unity-team/compiz/plugins-main-trunk.fixes-2011-03-04 into lp:~unity-team/compiz/plugins-main-trunk

[David Barth]

Allows expo to match the visual design better

[Didier Roche-Tolomelli (didrocks)]

The diff has conflicts, did you propose to the right branch?

It seems an UI change, that will be nice that you do the paper work here: https://wiki.ubuntu.com/FreezeExceptionProcess#UserInterfaceFreeze%20Exceptions

review: Needs Fixing

[Sam Spilsbury (smspillaz)]

You're right, somehow it ended up on lp:compiz again :/

On Fri, Apr 8, 2011 at 4:22 PM, Didier Roche <email address hidden> wrote:
> Review: Needs Fixing
> The diff has conflicts, did you propose to the right branch?
>
> It seems an UI change, that will be nice that you do the paper work here: https://wiki.ubuntu.com/FreezeExceptionProcess#UserInterfaceFreeze%20Exceptions
> --
> https://code.launchpad.net/~unity-team/compiz/plugins-main-trunk.fixes-2011-03-04/+merge/56892
> Your team Unity Team is subscribed to branch lp:~unity-team/compiz/trunk.
>

--
Sam Spilsbury

[Sam Spilsbury (smspillaz)]

You're right, somehow it ended up on lp:compiz again :/

On Fri, Apr 8, 2011 at 4:22 PM, Didier Roche <email address hidden> wrote:
> Review: Needs Fixing
> The diff has conflicts, did you propose to the right branch?
>
> It seems an UI change, that will be nice that you do the paper work here: https://wiki.ubuntu.com/FreezeExceptionProcess#UserInterfaceFreeze%20Exceptions
> --
> https://code.launchpad.net/~unity-team/compiz/plugins-main-trunk.fixes-2011-03-04/+merge/56892
> Your team Unity Team is subscribed to branch lp:~unity-team/compiz/trunk.
>

--
Sam Spilsbury

[David Barth (dbarth)]

I've re-proposed the patch to the correct branch: lp:~unity-team/compiz/plugins-main-trunk

[lp:~unity-team/compiz/plugins-main-trunk.fixes-2011-03-04]

5. By Sam Spilsbury on 2011-04-08

Much better implementation. Default should be X Offset: 64, Y Offset: 24

[Didier Roche-Tolomelli (didrocks)]

+1 looks good!

A bug should be opened and treated for the UI freeze.

review: Approve

=== modified file 'expo/expo.xml.in'
--- expo/expo.xml.in	2011-03-29 16:36:40 +0000
+++ expo/expo.xml.in	2011-04-08 11:34:30 +0000
@@ -131,6 +131,18 @@
 			<_name>Curve</_name>
 		    </desc>
 		</option>
+		<option name="x_offset" type="int">
+		    <_short>X Space</_short>
+		    <_long> Left Side screen space of expo in pixels</_long>
+		    <min>-1680</min>
+		    <max>1680</max>
+                </option>
+		<option name="y_offset" type="int">
+		    <_short>Y Space</_short>
+		    <_long> Top Side screen space of expo in pixels</_long>
+		    <min>-100</min>
+		    <max>100</max>
+                </option>
 		<option name="distance" type="float">
 		    <_short>Distance</_short>
 		    <_long>Distance of the expo wall</_long>
 
=== modified file 'expo/src/expo.cpp'
--- expo/src/expo.cpp	2011-04-06 17:52:52 +0000
+++ expo/src/expo.cpp	2011-04-08 11:34:30 +0000
@@ -805,6 +805,8 @@
 
     sTransform.scale (oScale, oScale, 1.0);
 
+    //fprintf (stderr, "cam is %f %f %f\n", cam[GLVector::x], cam[GLVector::y], cam[GLVector::z]);
+
     /* zoom out */
     oScale = DEFAULT_Z_CAMERA / (cam[GLVector::z] + DEFAULT_Z_CAMERA);
     sTransform.scale (oScale, oScale, oScale);
@@ -833,9 +835,15 @@
     sTransform.rotate (rotation, 0.0f, 1.0f, 0.0f);
     sTransform.scale (aspectX, aspectY, 1.0);
 
+    float xoffset = ((vpSize.x () * sx) / ((float) screen->width ()) * optionGetXOffset ()) * sigmoidProgress (expoCam);
+    float yoffset = ((vpSize.y () * sy) / ((float) screen->height ()) * optionGetYOffset ()) * sigmoidProgress (expoCam);
+    float xadjs = 1.0f - ((float) optionGetXOffset () / (float) screen->width ()) * sigmoidProgress (expoCam);
+    float yadjs = 1.0f - ((float) optionGetYOffset () / (float) screen->height ()) * sigmoidProgress (expoCam);
+
     /* translate expo to center */
-    sTransform.translate (vpSize.x () * sx * -0.5,
-			  vpSize.y () * sy * 0.5, 0.0f);
+    sTransform.translate (vpSize.x () * sx * -0.5 + xoffset,
+			  vpSize.y () * sy * 0.5 - yoffset, 0.0f);
+    sTransform.scale (xadjs, yadjs, 1.0f);
 
     if (optionGetDeform () == DeformCurve)
 	sTransform.translate ((vpSize.x () - 1) * sx * 0.5, 0.0, 0.0);