Merge lp:~townsend/compiz/fix-lp1031710 into lp:compiz/0.9.11

[Christopher Townsend]

Removed logic in the calculateWallOffset() function in the Expo plugin that only accounted for offsetting the expo animation on the left-most and top-most monitor. Also removed the TestNoOffsetIfOutputIsNotOrigin test since this test is now invalid.

When viewing the workspace switcher via Expo, the workspace switcher is drawn under the Launcher on non-primary monitors.

This fix removes the logic in the calculateWallOffset() function that only accounts for offsetting the switcher on the primary display. This also removes the TestNoOffsetIfOutputIsNotOrigin test as it's no longer valid with this change.

[Brandon Schaefer (brandontschaefer)]

LGTM

review: Approve

[MC Return (mc-return)]

LGTM also.

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/compiz-autolanding/150/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/compiz-saucy-amd64-autolanding/62/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/compiz-saucy-armhf-autolanding/62/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/compiz-saucy-i386-autolanding/62/console

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:3784
http://jenkins.qa.ubuntu.com/job/compiz-ci/292/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/compiz-saucy-amd64-ci/105/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/compiz-saucy-armhf-ci/105/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/compiz-saucy-i386-ci/105/console

Click here to trigger a rebuild:
http://s-jenkins:8080/job/compiz-ci/292/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/compiz-autolanding/154/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/compiz-saucy-amd64-autolanding/66
    FAILURE: http://jenkins.qa.ubuntu.com/job/compiz-saucy-armhf-autolanding/66/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/compiz-saucy-i386-autolanding/66

review: Needs Fixing (continuous-integration)

[Christopher Townsend (townsend)]

Weird armhf failure. Try it again...

[PS Jenkins bot (ps-jenkins)]

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/compiz-autolanding/155/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/compiz-saucy-amd64-autolanding/67
    FAILURE: http://jenkins.qa.ubuntu.com/job/compiz-saucy-armhf-autolanding/67/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/compiz-saucy-i386-autolanding/67

review: Needs Fixing (continuous-integration)

[Francis Ginther (fginther)]

Found jenkins issue, re-approving.

[PS Jenkins bot (ps-jenkins)]

review: Approve (continuous-integration)

=== modified file 'plugins/expo/src/wall_offset/src/wall-offset.cpp'
--- plugins/expo/src/wall_offset/src/wall-offset.cpp	2013-06-13 21:11:08 +0000
+++ plugins/expo/src/wall_offset/src/wall-offset.cpp	2013-08-21 20:34:32 +0000
@@ -39,17 +39,11 @@
 	    worldScaleFactorX = 1.0f;
 	    worldScaleFactorY = 1.0f;
 
-	    if (output.left () == 0)
-	    {
-		offsetInWorldX = ((vpSize.x () * sx) / ((float) output.width ()) * (offsetInScreenCoords.x ()) * animationProgress);
-		worldScaleFactorX = 1.0f - ((float) (offsetInScreenCoords.x ()) / (float) (output.width ())) * animationProgress;
-	    }
+	    offsetInWorldX = ((vpSize.x () * sx) / ((float) output.width ()) * (offsetInScreenCoords.x ()) * animationProgress);
+	    worldScaleFactorX = 1.0f - ((float) (offsetInScreenCoords.x ()) / (float) (output.width ())) * animationProgress;
 
-	    if (output.top () == 0)
-	    {
-		offsetInWorldY = ((vpSize.y () * sy) / ((float) output.height ()) * (offsetInScreenCoords.y ()) * animationProgress);
-		worldScaleFactorY = 1.0f - ((float) (offsetInScreenCoords.y ()) / (float) output.height ()) * animationProgress;
-	    }
+	    offsetInWorldY = ((vpSize.y () * sy) / ((float) output.height ()) * (offsetInScreenCoords.y ()) * animationProgress);
+	    worldScaleFactorY = 1.0f - ((float) (offsetInScreenCoords.y ()) / (float) output.height ()) * animationProgress;
 	}
     }
 }

=== modified file 'plugins/expo/src/wall_offset/tests/test-expo-wall-offset.cpp'
--- plugins/expo/src/wall_offset/tests/test-expo-wall-offset.cpp	2012-11-23 09:07:48 +0000
+++ plugins/expo/src/wall_offset/tests/test-expo-wall-offset.cpp	2013-08-21 20:34:32 +0000
@@ -232,30 +232,6 @@
     EXPECT_FLOAT_EQ (worldScaleFactorY, offset.animationParameters[index].worldScaleFactorY);
 }
 
-TEST_F (ExpoWallOffsetTest, TestNoOffsetIfOutputIsNotOrigin)
-{
-    compiz::expo::calculateWallOffset (CompRect (1,
-						 1,
-						 100,
-						 100),
-				       CompPoint (100,
-						  100),
-				       CompPoint (1,
-						  1),
-				       CompSize (100,
-						 100),
-				       offsetInWorldX,
-				       offsetInWorldY,
-				       worldScaleFactorX,
-				       worldScaleFactorY,
-				       1.0);
-
-    EXPECT_FLOAT_EQ (offsetInWorldX, 0.0f);
-    EXPECT_FLOAT_EQ (offsetInWorldY, 0.0f);
-    EXPECT_FLOAT_EQ (worldScaleFactorX, 1.0f);
-    EXPECT_FLOAT_EQ (worldScaleFactorY, 1.0f);
-}
-
 INSTANTIATE_TEST_CASE_P (ExpoAnimationOffsetTest,
 			 ExpoWallOffsetTestAnimations,
 			 Combine (ValuesIn (testingOffsetParameters),