diff options
author | Drew DeVault <sir@cmpwn.com> | 2018-01-21 12:18:48 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-01-21 12:18:48 -0500 |
commit | fab88cd96a65fac63bb72f44581faed6a26cdd98 (patch) | |
tree | 091c3efc14e71e5e402f7727d7e134102d9b6432 | |
parent | Merge pull request #1564 from pvsr/0.15 (diff) | |
parent | Fix out of focus when using mouse to change workspace (diff) | |
download | sway-fab88cd96a65fac63bb72f44581faed6a26cdd98.tar.gz sway-fab88cd96a65fac63bb72f44581faed6a26cdd98.tar.zst sway-fab88cd96a65fac63bb72f44581faed6a26cdd98.zip |
Merge pull request #1563 from nearffxx/0.15
Fix out of focus when using mouse to change workspace
-rw-r--r-- | sway/focus.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/sway/focus.c b/sway/focus.c index e9b032f8..751de1f1 100644 --- a/sway/focus.c +++ b/sway/focus.c | |||
@@ -162,12 +162,12 @@ bool set_focused_container(swayc_t *c) { | |||
162 | } | 162 | } |
163 | if (c->type == C_VIEW) { | 163 | if (c->type == C_VIEW) { |
164 | wlc_view_set_state(c->handle, WLC_BIT_ACTIVATED, true); | 164 | wlc_view_set_state(c->handle, WLC_BIT_ACTIVATED, true); |
165 | } | 165 | if (!desktop_shell.is_locked) { |
166 | if (!desktop_shell.is_locked) { | 166 | // If the system is locked, we do everything _but_ actually setting |
167 | // If the system is locked, we do everything _but_ actually setting | 167 | // focus. This includes making our internals think that this view is |
168 | // focus. This includes making our internals think that this view is | 168 | // focused. |
169 | // focused. | 169 | wlc_view_focus(c->handle); |
170 | wlc_view_focus(c->handle); | 170 | } |
171 | } | 171 | } |
172 | if (c->parent->layout != L_TABBED && c->parent->layout != L_STACKED) { | 172 | if (c->parent->layout != L_TABBED && c->parent->layout != L_STACKED) { |
173 | update_container_border(c); | 173 | update_container_border(c); |