aboutsummaryrefslogtreecommitdiff
path: root/sway
diff options
context:
space:
mode:
authorRyan Dwyer <RyanDwyer@users.noreply.github.com>2018-08-04 10:26:55 +1000
committerGitHub <noreply@github.com>2018-08-04 10:26:55 +1000
commit5de2223c6df480759ee6d8f4422c2643491595d0 (patch)
tree27a696a801539c946ac597e20b920c4b29697204 /sway
parent38675eba7be471a2dacb5928f54d046297c23517 (diff)
parente24fc3df18182f3b78cdf90322b0acabfb82a60e (diff)
Merge pull request #2419 from RedSoxFan/fix-2416
Check correct ws for sticky and fix floating iter
Diffstat (limited to 'sway')
-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 588e2aae..687d9c95 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;
}
}