view: respect rc.gap when moving to cursor

Fixes: #1494

diff --git a/src/view.c b/src/view.c
index b9f3e3216d6af99b43920acd60b7dd359d98d89d..34117248cbf052edc9f00f1c04934692ff3b40d8 100644 (file)
--- a/src/view.c
+++ b/src/view.c
@@ -434,18 +434,23 @@ view_move_to_cursor(struct view *view)
        int y = view->server->seat.cursor->y - (geo.height / 2);
 
        struct wlr_box usable = output_usable_area_in_layout_coords(pending_output);
+
+       /* Limit usable region to account for gap */
+       usable.x += rc.gap;
+       usable.y += rc.gap;
+       usable.width -= 2 * rc.gap;
+       usable.height -= 2 * rc.gap;
+
        if (x + geo.width > usable.x + usable.width) {
                x = usable.x + usable.width - geo.width;
        }
-       x = MAX(x, usable.x);
+       x = MAX(x, usable.x) + margin.left;
 
        if (y + geo.height > usable.y + usable.height) {
                y = usable.y + usable.height - geo.height;
        }
-       y = MAX(y, usable.y);
+       y = MAX(y, usable.y) + margin.top;
 
-       x += margin.left;
-       y += margin.top;
        view_move(view, x, y);
 }