Merge lp:~klap-in/compiz-plugins-main/bug904205 into lp:compiz-plugins-main

[klap-in]

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.

[Daniel van Vugt (vanvugt)]

Tested and approved in:
https://code.launchpad.net/~klap-in/compiz/bug904205/+merge/113058

review: Approve

=== modified file 'wall/src/wall.cpp'
--- wall/src/wall.cpp	2012-05-09 01:57:02 +0000
+++ wall/src/wall.cpp	2012-06-30 11:28:18 +0000
@@ -737,17 +737,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;
 	    }
 
@@ -755,17 +755,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;