diff options
author | Ryan Dwyer <RyanDwyer@users.noreply.github.com> | 2018-08-04 10:26:55 +1000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-08-04 10:26:55 +1000 |
commit | 5de2223c6df480759ee6d8f4422c2643491595d0 (patch) | |
tree | 27a696a801539c946ac597e20b920c4b29697204 | |
parent | Merge pull request #2400 from RedSoxFan/swaynag-config-errors (diff) | |
parent | Merge branch 'master' into fix-2416 (diff) | |
download | sway-5de2223c6df480759ee6d8f4422c2643491595d0.tar.gz sway-5de2223c6df480759ee6d8f4422c2643491595d0.tar.zst sway-5de2223c6df480759ee6d8f4422c2643491595d0.zip |
Merge pull request #2419 from RedSoxFan/fix-2416
Check correct ws for sticky and fix floating iter
-rw-r--r-- | sway/tree/workspace.c | 5 |
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) { | |||
412 | has_sticky = true; | 412 | has_sticky = true; |
413 | container_remove_child(floater); | 413 | container_remove_child(floater); |
414 | container_add_child(workspace->sway_workspace->floating, floater); | 414 | container_add_child(workspace->sway_workspace->floating, floater); |
415 | if (floater == focus) { | ||
416 | seat_set_focus(seat, NULL); | ||
417 | seat_set_focus(seat, floater); | ||
418 | } | ||
419 | --i; | ||
415 | } | 420 | } |
416 | } | 421 | } |
417 | 422 | ||