From: tokyo4j <hrak1529@gmail.com>
Date: Tue, 23 Apr 2024 17:01:07 +0000 (+0900)
Subject: edges.c: fix flicker of snapped windows in nested session
X-Git-Url: https://git.mdlowis.com/?a=commitdiff_plain;h=2346cfd33f5dc073038adb27e2042936e0e1cac1;p=proto%2Flabwc.git

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

Fixes: #1621
---

diff --git a/src/edges.c b/src/edges.c
index c9c88184..e0c6b295 100644
--- 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);