Merge pull request #2989 from RyanDwyer/fix-focus-glitchiness

Fix focus after a non-visible workspace's last container is destroyed

1 files changed, 4 insertions, 0 deletions

diff --git a/sway/input/seat.c b/sway/input/seat.c
index 577619a7..9d4dc7af 100644
--- a/sway/input/seat.c
+++ b/sway/input/seat.c
@@ -185,7 +185,11 @@ static void handle_seat_node_destroy(struct wl_listener *listener, void *data) {
                 seat_set_focus(seat, next_focus);
         } else {
                 // Setting focus_inactive
+                focus = seat_get_focus_inactive(seat, &root->node);
                 seat_set_raw_focus(seat, next_focus);
+                if (focus->type == N_CONTAINER) {
+                        seat_set_raw_focus(seat, &focus->sway_container->workspace->node);
+                }
                 seat_set_raw_focus(seat, focus);
         }
 }