summaryrefslogtreecommitdiff
path: root/sway/focus.c
diff options
context:
space:
mode:
authortaiyu <[email protected]>2015-08-18 23:52:42 -0700
committertaiyu <[email protected]>2015-08-18 23:52:42 -0700
commit1bf02144e558630f36b1efca45d6074be456c0b4 (patch)
tree4efdf2bddfc4b141bd34e453da2e2e1abdfa2a69 /sway/focus.c
parent6dc1ae802bb8cf1c272dc48c68fb42e3d548e812 (diff)
fixed floating_modifier related things
Diffstat (limited to 'sway/focus.c')
-rw-r--r--sway/focus.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/sway/focus.c b/sway/focus.c
index 1f17dfc9..0ee10694 100644
--- a/sway/focus.c
+++ b/sway/focus.c
@@ -168,8 +168,11 @@ void set_focused_container(swayc_t *c) {
}
// activate current focus
if (p->type == C_VIEW) {
- wlc_view_focus(p->handle);
wlc_view_set_state(p->handle, WLC_BIT_ACTIVATED, true);
+ //set focus if view_focus is unlocked
+ if (!locked_view_focus) {
+ wlc_view_focus(p->handle);
+ }
}
}
}