Merge pull request #1563 from nearffxx/0.15

Fix out of focus when using mouse to change workspace

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) {
 		}
 		if (c->type == C_VIEW) {
 			wlc_view_set_state(c->handle, WLC_BIT_ACTIVATED, true);
-		}
-		if (!desktop_shell.is_locked) {
-			// If the system is locked, we do everything _but_ actually setting
-			// focus. This includes making our internals think that this view is
-			// focused.
-			wlc_view_focus(c->handle);
+			if (!desktop_shell.is_locked) {
+				// If the system is locked, we do everything _but_ actually setting
+				// focus. This includes making our internals think that this view is
+				// focused.
+				wlc_view_focus(c->handle);
+			}
 		}
 		if (c->parent->layout != L_TABBED && c->parent->layout != L_STACKED) {
 			update_container_border(c);