edges.c: fix flicker of snapped windows in nested session

Fixes: #1621

diff --git a/src/edges.c b/src/edges.c
index c9c881845580cd55ed0a097d04b2eb5d276b202f..e0c6b295a4589ba6876d343b6ad1a8b5f1073e77 100644 (file)
--- a/src/edges.c
+++ b/src/edges.c
@@ -515,7 +515,7 @@ edges_adjust_move_coords(struct view *view, struct border edges,
 
        if (view_geom->x != *x) {
                int lshift = border.left + rc.gap;
-               int rshift = border.right + rc.gap + view->pending.width;
+               int rshift = border.right + rc.gap + view_geom->width;
 
                adjust_move_coords_1d(x, edges.left, lshift,
                        edges.right, rshift, *x < view_geom->x);
@@ -524,7 +524,7 @@ edges_adjust_move_coords(struct view *view, struct border edges,
        if (view_geom->y != *y) {
                int tshift = border.top + rc.gap;
                int bshift = border.bottom + rc.gap
-                       + view_effective_height(view, /* use_pending */ true);
+                       + view_effective_height(view, use_pending);
 
                adjust_move_coords_1d(y, edges.top, tshift,
                        edges.bottom, bshift, *y < view_geom->y);