Merge lp:~mc-return/compiz/compiz-raring.merge-fix1139835-grid-wrong-top-left-corner-calculation into lp:compiz/raring

[MC Return]

Backported fix for bug #1139835 (lp:compiz r3630) to Compiz Raring:

Grid plugin:
Fixed wrong calculation of top-left corner coordinates.
Now detection of this corner also works on multimonitor configurations.
Improved readability of the grid corner detection code.

Note:
Some brackets are superfluos, but they have been added for better readability.

Note 2:
Grid's indentation is completely broken after recent hacking on it, but this branch ignores that.

[Łukasz Zemczak (sil2100)]

As with trunk, works well +1

review: Approve

[MC Return (mc-return)]

sil2100, thanks :) +1

[PS Jenkins bot (ps-jenkins)]

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/compiz-mbs-autolanding/48/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/compiz-arm-mbs-autolanding/./build=panda-pbuilder,distribution=raring,flavor=armhf/46/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/compiz-x86-mbs-autolanding/./build=pbuilder,distribution=raring,flavor=amd64/48
    SUCCESS: http://jenkins.qa.ubuntu.com/job/compiz-x86-mbs-autolanding/./build=pbuilder,distribution=raring,flavor=i386/48

review: Needs Fixing (continuous-integration)

[MC Return (mc-return)]

Some Jenkins connection failure: Err http://naartjie raring/ Release.gpg
  Could not connect to naartjie:80 (10.97.9.6). - connect (110: Connection timed out)

Needs re-approval to land, I guess...

[Timo Jyrinki (timo-jyrinki)]

Trying...

review: Approve

[Francis Ginther (fginther)]

I'm looking into the jenkins failure. Some new arm builders have been added and one or two may have not been configured correctly. Will top approve once I have it checked out.

[PS Jenkins bot (ps-jenkins)]

review: Approve (continuous-integration)

=== modified file 'plugins/grid/src/grid.cpp'
--- plugins/grid/src/grid.cpp	2013-01-23 06:18:17 +0000
+++ plugins/grid/src/grid.cpp	2013-03-22 10:14:23 +0000
@@ -732,34 +732,43 @@
                    screen->outputDeviceForPoint (CompPoint (pointerX, pointerY)));
 
     /* Detect corners first */
+
     /* Bottom Left */
-    if (pointerY > (out.y () + out.height () - optionGetBottomEdgeThreshold()) &&
-        pointerX < out.x () + optionGetLeftEdgeThreshold())
+    if (pointerY > (out.y () + out.height () - optionGetBottomEdgeThreshold ()) &&
+	pointerX < (out.x () + optionGetLeftEdgeThreshold ()))
 	edge = BottomLeft;
+
     /* Bottom Right */
-    else if (pointerY > (out.y () + out.height () - optionGetBottomEdgeThreshold()) &&
-             pointerX > (out.x () + out.width () - optionGetRightEdgeThreshold()))
+    else if (pointerY > (out.y () + out.height () - optionGetBottomEdgeThreshold ()) &&
+	     pointerX > (out.x () + out.width () - optionGetRightEdgeThreshold ()))
 	edge = BottomRight;
+
     /* Top Left */
-    else if (pointerY < optionGetTopEdgeThreshold() &&
-	    pointerX < optionGetLeftEdgeThreshold())
+    else if (pointerY < (out.y () + optionGetTopEdgeThreshold ()) &&
+	     pointerX < (out.x () + optionGetLeftEdgeThreshold ()))
 	edge = TopLeft;
+
     /* Top Right */
-    else if (pointerY < out.y () + optionGetTopEdgeThreshold() &&
-             pointerX > (out.x () + out.width () - optionGetRightEdgeThreshold()))
+    else if (pointerY < (out.y () + optionGetTopEdgeThreshold ()) &&
+	     pointerX > (out.x () + out.width () - optionGetRightEdgeThreshold ()))
 	edge = TopRight;
+
     /* Left */
-    else if (pointerX < out.x () + optionGetLeftEdgeThreshold())
+    else if (pointerX < (out.x () + optionGetLeftEdgeThreshold ()))
 	edge = Left;
+
     /* Right */
-    else if (pointerX > (out.x () + out.width () - optionGetRightEdgeThreshold()))
+    else if (pointerX > (out.x () + out.width () - optionGetRightEdgeThreshold ()))
 	edge = Right;
+
     /* Top */
-    else if (pointerY < out.y () + optionGetTopEdgeThreshold())
+    else if (pointerY < (out.y () + optionGetTopEdgeThreshold ()))
 	edge = Top;
+
     /* Bottom */
-    else if (pointerY > (out.y () + out.height () - optionGetBottomEdgeThreshold()))
+    else if (pointerY > (out.y () + out.height () - optionGetBottomEdgeThreshold ()))
 	edge = Bottom;
+
     /* No Edge */
     else
 	edge = NoEdge;