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

Proposed by David Barth on 2011-04-08
Status: Merged
Merged at revision: 4
Proposed branch: lp:~unity-team/compiz/plugins-main-trunk.fixes-2011-03-04
Merge into: lp:~unity-team/compiz/plugins-main-trunk
Diff against target: 53 lines (+22/-2)
2 files modified
expo/expo.xml.in (+12/-0)
expo/src/expo.cpp (+10/-2)
To merge this branch: bzr merge lp:~unity-team/compiz/plugins-main-trunk.fixes-2011-03-04
Reviewer Review Type Date Requested Status
Didier Roche 2011-04-08 Approve on 2011-04-08
Review via email: mp+56919@code.launchpad.net

This proposal supersedes a proposal from 2011-04-08.

Description of the change

Allows expo to match the visual design better

To post a comment you must log in.
Didier Roche (didrocks) wrote : Posted in a previous version of this proposal

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) wrote : Posted in a previous version of this proposal

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) wrote : Posted in a previous version of this proposal

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) wrote :

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

5. By Sam Spilsbury on 2011-04-08

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

Didier Roche (didrocks) wrote :

+1 looks good!

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

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'expo/expo.xml.in'
2--- expo/expo.xml.in 2011-03-29 16:36:40 +0000
3+++ expo/expo.xml.in 2011-04-08 11:34:30 +0000
4@@ -131,6 +131,18 @@
5 <_name>Curve</_name>
6 </desc>
7 </option>
8+ <option name="x_offset" type="int">
9+ <_short>X Space</_short>
10+ <_long> Left Side screen space of expo in pixels</_long>
11+ <min>-1680</min>
12+ <max>1680</max>
13+ </option>
14+ <option name="y_offset" type="int">
15+ <_short>Y Space</_short>
16+ <_long> Top Side screen space of expo in pixels</_long>
17+ <min>-100</min>
18+ <max>100</max>
19+ </option>
20 <option name="distance" type="float">
21 <_short>Distance</_short>
22 <_long>Distance of the expo wall</_long>
23
24=== modified file 'expo/src/expo.cpp'
25--- expo/src/expo.cpp 2011-04-06 17:52:52 +0000
26+++ expo/src/expo.cpp 2011-04-08 11:34:30 +0000
27@@ -805,6 +805,8 @@
28
29 sTransform.scale (oScale, oScale, 1.0);
30
31+ //fprintf (stderr, "cam is %f %f %f\n", cam[GLVector::x], cam[GLVector::y], cam[GLVector::z]);
32+
33 /* zoom out */
34 oScale = DEFAULT_Z_CAMERA / (cam[GLVector::z] + DEFAULT_Z_CAMERA);
35 sTransform.scale (oScale, oScale, oScale);
36@@ -833,9 +835,15 @@
37 sTransform.rotate (rotation, 0.0f, 1.0f, 0.0f);
38 sTransform.scale (aspectX, aspectY, 1.0);
39
40+ float xoffset = ((vpSize.x () * sx) / ((float) screen->width ()) * optionGetXOffset ()) * sigmoidProgress (expoCam);
41+ float yoffset = ((vpSize.y () * sy) / ((float) screen->height ()) * optionGetYOffset ()) * sigmoidProgress (expoCam);
42+ float xadjs = 1.0f - ((float) optionGetXOffset () / (float) screen->width ()) * sigmoidProgress (expoCam);
43+ float yadjs = 1.0f - ((float) optionGetYOffset () / (float) screen->height ()) * sigmoidProgress (expoCam);
44+
45 /* translate expo to center */
46- sTransform.translate (vpSize.x () * sx * -0.5,
47- vpSize.y () * sy * 0.5, 0.0f);
48+ sTransform.translate (vpSize.x () * sx * -0.5 + xoffset,
49+ vpSize.y () * sy * 0.5 - yoffset, 0.0f);
50+ sTransform.scale (xadjs, yadjs, 1.0f);
51
52 if (optionGetDeform () == DeformCurve)
53 sTransform.translate ((vpSize.x () - 1) * sx * 0.5, 0.0, 0.0);

Subscribers

People subscribed via source and target branches

to all changes: