Merge branch 'master' into chaz

[chaz/openbox] / openbox / moveresize.c

diff --git a/openbox/moveresize.c b/openbox/moveresize.c
index d700da9ebd66a0ecacb8d10c4e15bc0a2b75c4f2..ffed909315037ae4b6882f92b391dbc3b0dc8a7d 100644 (file)
--- a/openbox/moveresize.c
+++ b/openbox/moveresize.c
@@ -630,6 +630,10 @@ static void do_edge_warp(gint x, gint y)
 
     for (i = 0; i < screen_num_monitors; ++i) {
         const Rect *a = screen_physical_area_monitor(i);
+
+        if (!RECT_CONTAINS(*a, x, y))
+            continue;
+
         if (x == RECT_LEFT(*a)) dir = OB_DIRECTION_WEST;
         if (x == RECT_RIGHT(*a)) dir = OB_DIRECTION_EAST;
         if (y == RECT_TOP(*a)) dir = OB_DIRECTION_NORTH;