From a4e4e21edfc6aed09c0be67c43fa4b1364f647c0 Mon Sep 17 00:00:00 2001 From: Brian Ashworth Date: Mon, 13 Jan 2020 21:11:11 -0500 Subject: [PATCH] container: add inactive fullscreen to focus stack When a container was being made fullscreen and it is on the focused workspace for a seat, focus was being set to the container. However, when the container was on a non-focused workspace, the focus stack wasn't being touched. When assigning a fullscreen container to a workspace or moving a fullscreen container to a different workspace, this would make it so the fullscreen container was never added to the focus stack for the workspace thus preventing access to the workspace. This adds the container to the top of the focus stack, behind the container on the focused workspace. --- sway/tree/container.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/sway/tree/container.c b/sway/tree/container.c index b89047a72..aa819be78 100644 --- a/sway/tree/container.c +++ b/sway/tree/container.c @@ -958,6 +958,11 @@ static void container_fullscreen_workspace(struct sway_container *con) { focus_ws = seat_get_focused_workspace(seat); if (focus_ws == con->workspace) { seat_set_focus_container(seat, con); + } else { + struct sway_node *focus = + seat_get_focus_inactive(seat, &root->node); + seat_set_raw_focus(seat, &con->node); + seat_set_raw_focus(seat, focus); } } }