aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrian Ashworth <bosrsf04@gmail.com>2018-08-03 11:36:18 -0400
committerBrian Ashworth <bosrsf04@gmail.com>2018-08-03 11:36:18 -0400
commitad2a7c26180dcb1ab0d2d128e207921152762ed6 (patch)
tree9e504d0886f3beda1805cda094ba4ebfe423cf88
parent3e2bf7f3a550db995a38808e0abd53fefab96f80 (diff)
downloadsway-ad2a7c26180dcb1ab0d2d128e207921152762ed6.zip
sway-ad2a7c26180dcb1ab0d2d128e207921152762ed6.tar.gz
sway-ad2a7c26180dcb1ab0d2d128e207921152762ed6.tar.bz2
Check correct ws for sticky and fix floating iter
-rw-r--r--sway/tree/workspace.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/sway/tree/workspace.c b/sway/tree/workspace.c
index 588e2aa..687d9c9 100644
--- a/sway/tree/workspace.c
+++ b/sway/tree/workspace.c
@@ -412,6 +412,11 @@ bool workspace_switch(struct sway_container *workspace) {
has_sticky = true;
container_remove_child(floater);
container_add_child(workspace->sway_workspace->floating, floater);
+ if (floater == focus) {
+ seat_set_focus(seat, NULL);
+ seat_set_focus(seat, floater);
+ }
+ --i;
}
}