diff options
| author | Drew DeVault <sir@cmpwn.com> | 2016-08-01 22:33:37 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-08-01 22:33:37 -0400 |
| commit | a4096b73c948e7f8496810df70842c54b2988d5e (patch) | |
| tree | bd25bf981361c7e518d66df7ededf23d38cc165f /sway/focus.c | |
| parent | 2d907ef1f6f13a7921c295502d7b1047945cc327 (diff) | |
| parent | 2f65100bee904493cb90863d6dc54d774b6a39c3 (diff) | |
| download | sway-a4096b73c948e7f8496810df70842c54b2988d5e.tar.xz | |
Merge pull request #813 from acrisci/bug/remove-dead-lock-var
Remove dead global locked_view_focus
Diffstat (limited to 'sway/focus.c')
| -rw-r--r-- | sway/focus.c | 16 |
1 files changed, 5 insertions, 11 deletions
diff --git a/sway/focus.c b/sway/focus.c index 45ec43e9..6583f802 100644 --- a/sway/focus.c +++ b/sway/focus.c @@ -10,7 +10,6 @@ #include "border.h" bool locked_container_focus = false; -bool locked_view_focus = false; bool suspend_workspace_cleanup = false; // switches parent focus to c. will switch it accordingly @@ -151,12 +150,9 @@ bool set_focused_container(swayc_t *c) { wlc_view_set_state(c->handle, WLC_BIT_ACTIVATED, true); } // set focus if view_focus is unlocked - if (!locked_view_focus) { - wlc_view_focus(c->handle); - if (c->parent->layout != L_TABBED - && c->parent->layout != L_STACKED) { - update_container_border(c); - } + wlc_view_focus(c->handle); + if (c->parent->layout != L_TABBED && c->parent->layout != L_STACKED) { + update_container_border(c); } // rearrange if parent container is tabbed/stacked @@ -167,10 +163,8 @@ bool set_focused_container(swayc_t *c) { } } else if (c->type == C_WORKSPACE) { // remove previous focus if view_focus is unlocked - if (!locked_view_focus) { - update_container_border(c); - wlc_view_focus(0); - } + update_container_border(c); + wlc_view_focus(0); } if (active_ws != workspace) { |