Merge pull request #2419 from RedSoxFan/fix-2416

Check correct ws for sticky and fix floating iter
This commit is contained in:
Ryan Dwyer 2018-08-04 10:26:55 +10:00 committed by GitHub
commit 5de2223c6d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -412,6 +412,11 @@ bool workspace_switch(struct sway_container *workspace) {
has_sticky = true; has_sticky = true;
container_remove_child(floater); container_remove_child(floater);
container_add_child(workspace->sway_workspace->floating, floater); container_add_child(workspace->sway_workspace->floating, floater);
if (floater == focus) {
seat_set_focus(seat, NULL);
seat_set_focus(seat, floater);
}
--i;
} }
} }