From c1be4b0153fc18b130ce795e71c8600c2dd31fc0 Mon Sep 17 00:00:00 2001
From: Ivan Chebykin <ivan@chebykin.org>
Date: Thu, 24 May 2018 23:19:18 +0300
Subject: [PATCH] Fix focusing from other containers

---
 sway/input/cursor.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/sway/input/cursor.c b/sway/input/cursor.c
index 0f8202eaf..72dc87003 100644
--- a/sway/input/cursor.c
+++ b/sway/input/cursor.c
@@ -163,8 +163,9 @@ void cursor_send_pointer_motion(struct sway_cursor *cursor, uint32_t time_msec,
 			}
 		} else {
 			// Don't switch focus on mouseover for stacked and tabbed layouts
-			if(c->parent && c->parent->layout != L_STACKED
-						 && c->parent->layout != L_TABBED) {
+			if(focus->parent == c->parent &&
+					(c->parent->layout != L_STACKED
+					|| c->parent->layout != L_TABBED)) {
 				seat_set_focus_warp(cursor->seat, c, false);
 			}
 		}