diff options
author | Aaron Ouellette <aouellette2016@gmail.com> | 2016-03-18 17:09:11 -0400 |
---|---|---|
committer | Aaron Ouellette <aouellette2016@gmail.com> | 2016-03-18 17:09:11 -0400 |
commit | 8af6a419ec6f4cfc596aabd5c820e7033cc760c4 (patch) | |
tree | d958fae88ea43df2e707830e5f6ca9bf6975a491 /sway/focus.c | |
parent | 133009b652e794bee083dbeb2fbdd2db787e84c6 (diff) | |
parent | 378a45cec23b76732a19d0027e1bba3ef2bf3752 (diff) | |
download | sway-8af6a419ec6f4cfc596aabd5c820e7033cc760c4.tar.xz |
Merge branch 'master' of git://github.com/SirCmpwn/sway into swaylock
Diffstat (limited to 'sway/focus.c')
-rw-r--r-- | sway/focus.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/sway/focus.c b/sway/focus.c index c2ded212..7f96eda7 100644 --- a/sway/focus.c +++ b/sway/focus.c @@ -139,6 +139,11 @@ bool set_focused_container(swayc_t *c) { wlc_view_focus(p->handle); } } + } else if (p->type == C_WORKSPACE) { + // remove previous focus if view_focus is unlocked + if (!locked_view_focus) { + wlc_view_focus(0); + } } if (active_ws != workspace) { |