mirrors/sway
1
0
Fork 0
mirror of https://github.com/swaywm/sway.git synced 2024-11-22 16:01:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3291 from RedSoxFan/fix-focus-nonvis

Browse source 
Fix focusing on non-visible workspace
This commit is contained in:
Ryan Dwyer 2018-12-15 09:51:56 +10:00 committed by GitHub
parent 1897edabba c2499772b9
commit cd714cc12a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
sway/input/seat.c
View file

@ -159,14 +159,6 @@ 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) {
@ -182,6 +174,12 @@ static void handle_seat_node_destroy(struct wl_listener *listener, void *data) {
parent = node_get_parent(parent); parent = node_get_parent(parent);
} }
if (next_focus->type == N_WORKSPACE &&
!workspace_is_visible(next_focus->sway_workspace)) {
// Do not change focus to a non-visible workspace
return;
}
if (needs_new_focus) { if (needs_new_focus) {
// The structure change might have caused it to move up to the top of // The structure change might have caused it to move up to the top of
// the focus stack without sending focus notifications to the view // the focus stack without sending focus notifications to the view