From 6f24bf5b34b027adfee8b306811a5ce1b0caed71 Mon Sep 17 00:00:00 2001 From: "K. Lange" Date: Fri, 5 Nov 2021 22:07:55 +0900 Subject: [PATCH] compositor: correctly set next focused window when a window closes --- apps/compositor.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/apps/compositor.c b/apps/compositor.c index 78bf42b7..61b727a3 100644 --- a/apps/compositor.c +++ b/apps/compositor.c @@ -1239,11 +1239,10 @@ static void window_actually_close(yutani_globals_t * yg, yutani_server_window_t if (w == yg->focused_window) { /* find the top z-ordered window */ yg->focused_window = NULL; - list_t * zorder_owner = window_zorder_owner(yg, w->z); - if (zorder_owner && zorder_owner != yg->overlay_zs) { - if (zorder_owner->tail && zorder_owner->tail->value) { - set_focused_window(yg, zorder_owner->tail->value); - } + if (yg->menu_zs->tail && yg->menu_zs->tail->value) { + set_focused_window(yg, yg->menu_zs->tail->value); + } else if (yg->mid_zs->tail && yg->mid_zs->tail->value) { + set_focused_window(yg, yg->mid_zs->tail->value); } }