Merge lp:~klap-in/compiz/bug904205 into lp:compiz/0.9.8

[klap-in]

Using the next/previous bindings the wall plugin didn't calculate correctly the next workspace when it reaches the begin or the end of a row of workspaces, so it didn't jump to the next line. (LP: #904205)

Using the next/previous bindings the wall plugin didn't calculate correctly the next workspace when it reachs the begin or the end of a row of workspaces, so it didn't jump to the next line.

[Sam Spilsbury (smspillaz)]

Looks fine. This code looks pretty testable on its own, so it would be good if someone could get this under test before we merge it. (Time permitting)

review: Approve

[Daniel van Vugt (vanvugt)]

I've tested everything I can think of with respect to wall sliding, layouts and wrapping. All works well.

review: Approve

[Unity Merger (unity-merger)]

No commit message specified.

=== modified file 'plugins/wall/src/wall.cpp'
--- plugins/wall/src/wall.cpp	2012-05-27 04:32:55 +0000
+++ plugins/wall/src/wall.cpp	2012-07-02 14:44:22 +0000
@@ -731,17 +731,17 @@
 	    if ((vpX == (unsigned int) size.width () - 1) &&
 	    	(vpY == (unsigned int) size.height () - 1))
 	    {
-		amountX = -(size.width () - 1);
-		amountY = -(size.height () - 1);
+		amountX = size.width () - 1;
+		amountY = size.height () - 1;
 	    }
 	    else if (vpX == (unsigned int) size.width () - 1)
 	    {
-		amountX = -(size.width () - 1);
-		amountY = 1;
+		amountX = size.width () - 1;
+		amountY = -1;
 	    }
 	    else
 	    {
-		amountX = 1;
+		amountX = -1;
 		amountY = 0;
 	    }
 
@@ -749,17 +749,17 @@
 	case Prev:
 	    if (vpX == 0 && vpY == 0)
 	    {
-		amountX = size.width () - 1;
-		amountY = size.height () - 1;
+		amountX = -(size.width () - 1);
+		amountY = -(size.height () - 1);
 	    }
 	    else if (vpX == 0)
 	    {
-		amountX = size.width () - 1;
-		amountY = -1;
+		amountX = -(size.width () - 1);
+		amountY = 1;
 	    }
 	    else
 	    {
-		amountX = -1;
+		amountX = 1;
 		amountY = 0;
 	    }
 	    break;