alex/swayfx
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Keep focus when destroying containers on nonvis ws

Browse source 
Changing the focus stack when destroying a container's node on a
non-visible workspace (on an non-focused output) incorrectly causes
the non-visible workspace to become visible. If the workspace is empty,
it will not be destroyed since it is now visible. Additionally since
there was no workspace::focus event, swaybar still shows the previous
workspace as focus-inactive. It also makes no sense to change visible
workspaces due to a container on a non-visible workspace being
destroyed.

Since the focus will either be set when switching to the non-visible
workspace or the workspace will be destroyed due to being empty, there
is no need to change the focus stack when destroying a container on a
non-visible workspace.
This commit is contained in:
Brian Ashworth 2018-12-12 01:24:17 -05:00 committed by emersion
parent 6acbe84fdd
commit bc981b2bbb
1 changed files with 8 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
sway/input/seat.c
View file

@ -159,6 +159,14 @@ static void handle_seat_node_destroy(struct wl_listener *listener, void *data) {
return; return;
} }
if (node->type == N_CONTAINER &&
!workspace_is_visible(node->sway_container->workspace)) {
// Do not change the focus stack on a non-visible workspace. The focus
// will either be set when the workspace becomes visible or the
// workspace is now empty and will be destroyed
return;
}
// Find new focus_inactive (ie. sibling, or workspace if no siblings left) // Find new focus_inactive (ie. sibling, or workspace if no siblings left)
struct sway_node *next_focus = NULL; struct sway_node *next_focus = NULL;
while (next_focus == NULL) { while (next_focus == NULL) {