Merge lp:~smspillaz/compcomm-plugins-main/compcomm-plugins-main.fix_963767 into lp:~compiz/compcomm-plugins-main/ubuntu

[Sam Spilsbury]

Fix LP #963767

[lp:~smspillaz/compcomm-plugins-main/compcomm-plugins-main.fix_963767]

264. By Sam Spilsbury on 2012-04-06

debian/patches/fix_963767.patch : fix LP #963767, scale correctly

265. By Sam Spilsbury on 2012-04-06

Change to UNRELEASED

[Didier Roche-Tolomelli (didrocks)]

good good ;)

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2012-04-03 13:45:13 +0000
+++ debian/changelog	2012-04-06 05:44:18 +0000
@@ -1,3 +1,9 @@
+compiz-plugins-main (1:0.9.7.0~bzr19-0ubuntu9) UNRELEASED; urgency=low
+
+  * debian/patches/fix_963767.patch : fix LP #963767, scale correctly
+
+ -- Sam Spilsbury <[e-mail]>  Fri, 06 Apr 2012 13:40:07 +0800
+
 compiz-plugins-main (1:0.9.7.0~bzr19-0ubuntu8) precise; urgency=low
 
   [ Matthias Niess]

=== added file 'debian/patches/fix_963767.patch'
--- debian/patches/fix_963767.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/fix_963767.patch	2012-04-06 05:44:18 +0000
@@ -0,0 +1,21 @@
+=== modified file 'src/expo.cpp'
+Index: compiz-plugins-main-0.9.7.0~bzr19/expo/src/expo.cpp
+===================================================================
+--- compiz-plugins-main-0.9.7.0~bzr19.orig/expo/src/expo.cpp	2012-04-06 11:33:35.619849554 +0800
++++ compiz-plugins-main-0.9.7.0~bzr19/expo/src/expo.cpp	2012-04-06 11:35:17.992357170 +0800
+@@ -1508,11 +1508,12 @@
+ 	{
+ 	    CompOutput *o = &screen->outputDevs ()[screen->outputDeviceForGeometry(window->geometry())];
+ 	    float yS = 1.0 + ((o->height () / (float) window->height ()) - 1.0f) * sigmoidProgress (eScreen->expoCam);
+-	    wTransform.translate (window->x () + window->width () / 2,
++	    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 (1.0f, yS, 1.0f);
+-	    wTransform.translate (-(window->x () + window->width () / 2),
++	    wTransform.scale (xS, yS, 1.0f);
++	    wTransform.translate (-(window->x () + window->width ()),
+ 				  -(window->y () + window->height ()),
+ 				  0.0f);
+ 

=== modified file 'debian/patches/series'
--- debian/patches/series	2012-03-21 10:46:38 +0000
+++ debian/patches/series	2012-04-06 05:44:18 +0000
@@ -8,3 +8,4 @@
 fix_broken_build.patch
 vpswitch_953834.patch
 fix_930192.patch
+fix_963767.patch