Merge branch 'master' into chaz

[chaz/openbox] / openbox / moveresize.c

diff --git a/openbox/moveresize.c b/openbox/moveresize.c
index 1625ccf01ccddd7aa5d0fc9036ab4c7ed5fdde14..ffed909315037ae4b6882f92b391dbc3b0dc8a7d 100644 (file)
--- a/openbox/moveresize.c
+++ b/openbox/moveresize.c
@@ -583,16 +583,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();