From f4c9d1ba9fe0ad99c27fda3493a7f9c97b5163fe Mon Sep 17 00:00:00 2001
From: Johan Malm <jgm323@gmail.com>
Date: Wed, 23 Feb 2022 22:39:57 +0000
Subject: [PATCH] Set node position in xdg/xwayland commit handlers

...in order to sync resize/move events to avoid left/bottom edge wobbling
when resizing with top/left resize edges
---
 src/view.c     | 3 ---
 src/xdg.c      | 2 ++
 src/xwayland.c | 6 ++++++
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/src/view.c b/src/view.c
index 64674482..740ed63f 100644
--- a/src/view.c
+++ b/src/view.c
@@ -48,7 +48,6 @@ view_move_resize(struct view *view, struct wlr_box geo)
 	}
 	ssd_update_title(view);
 	view_discover_output(view);
-	wlr_scene_node_set_position(&view->scene_tree->node, view->x, view->y);
 }
 
 #define MIN_VIEW_WIDTH (100)
@@ -150,7 +149,6 @@ view_center(struct view *view)
 	if (view_compute_centered_position(view, view->w, view->h, &x, &y)) {
 		view_move(view, x, y);
 	}
-	wlr_scene_node_set_position(&view->scene_tree->node, view->x, view->y);
 }
 
 static void
@@ -226,7 +224,6 @@ view_maximize(struct view *view, bool maximize)
 	if (view->fullscreen) {
 		return;
 	}
-	wlr_scene_node_set_position(&view->scene_tree->node, view->x, view->y);
 	if (view->impl->maximize) {
 		view->impl->maximize(view, maximize);
 	}
diff --git a/src/xdg.c b/src/xdg.c
index 3b6178f3..5ab801f3 100644
--- a/src/xdg.c
+++ b/src/xdg.c
@@ -57,6 +57,8 @@ handle_commit(struct wl_listener *listener, void *data)
 		if (serial == view->xdg_surface->current.configure_serial) {
 			view->pending_move_resize.configure_serial = 0;
 		}
+		wlr_scene_node_set_position(&view->scene_tree->node,
+			view->x, view->y);
 	}
 	ssd_update_geometry(view);
 	damage_view_part(view);
diff --git a/src/xwayland.c b/src/xwayland.c
index fa4be0fa..ddbff726 100644
--- a/src/xwayland.c
+++ b/src/xwayland.c
@@ -12,6 +12,8 @@ handle_commit(struct wl_listener *listener, void *data)
 	/* Must receive commit signal before accessing surface->current* */
 	view->w = view->surface->current.width;
 	view->h = view->surface->current.height;
+	bool move_pending = view->pending_move_resize.update_x
+		|| view->pending_move_resize.update_y;
 
 	if (view->pending_move_resize.update_x) {
 		view->x = view->pending_move_resize.x +
@@ -23,6 +25,10 @@ handle_commit(struct wl_listener *listener, void *data)
 			view->pending_move_resize.height - view->h;
 		view->pending_move_resize.update_y = false;
 	}
+	if (move_pending) {
+		wlr_scene_node_set_position(&view->scene_tree->node,
+			view->x, view->y);
+	}
 	ssd_update_geometry(view);
 	damage_view_whole(view);
 }