From c44ffa2be5ac724205319a4c486b82f5baa1ea8d Mon Sep 17 00:00:00 2001 From: Ronan Pigott Date: Sun, 13 Dec 2020 00:49:31 -0700 Subject: [PATCH] Delay refocus until after arranging nodes i3 determines focus after it arranges its nodes, so the ipc events that follow have the newly updated window geometry. --- sway/tree/container.c | 2 -- sway/tree/view.c | 1 + 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/sway/tree/container.c b/sway/tree/container.c index 10d621b4a..aaa6cd073 100644 --- a/sway/tree/container.c +++ b/sway/tree/container.c @@ -97,8 +97,6 @@ void container_begin_destroy(struct sway_container *con) { container_fullscreen_disable(con); } - wl_signal_emit(&con->node.events.destroy, &con->node); - container_end_mouse_operation(con); con->node.destroying = true; diff --git a/sway/tree/view.c b/sway/tree/view.c index 354f2d34b..850b5650e 100644 --- a/sway/tree/view.c +++ b/sway/tree/view.c @@ -844,6 +844,7 @@ void view_unmap(struct sway_view *view) { seat_consider_warp_to_focus(seat); } + wl_signal_emit(&view->container->node.events.destroy, &view->container->node); transaction_commit_dirty(); view->surface = NULL; }