Merge branch 'master' into chaz

[chaz/openbox] / openbox / moveresize.c

diff --git a/openbox/moveresize.c b/openbox/moveresize.c
index 333a1bea5ff3563f35d45ddc7358dc0015a57d11..a8965570b10c22de31cb0b9269ae4bcf1ff0c022 100644 (file)
--- a/openbox/moveresize.c
+++ b/openbox/moveresize.c
@@ -587,16 +587,16 @@ static void edge_warp_move_ptr(void)
 
     switch (edge_warp_dir) {
     case OB_DIRECTION_NORTH:
-        y = a->height - 1;
+        y = a->height - 2;
         break;
     case OB_DIRECTION_EAST:
-        x = a->x;
+        x = a->x + 1;
         break;
     case OB_DIRECTION_SOUTH:
-        y = a->y;
+        y = a->y + 1;
         break;
     case OB_DIRECTION_WEST:
-        x = a->width - 1;
+        x = a->width - 2;
         break;
     default:
         g_assert_not_reached();