try to fix focus-inactive

1 files changed, 8 insertions, 12 deletions

diff --git a/sway/input/seat.c b/sway/input/seat.c
index 4a99e9eb..078cb8b8 100644
--- a/sway/input/seat.c
+++ b/sway/input/seat.c
@@ -467,22 +467,18 @@ struct sway_container *sway_seat_get_focus(struct sway_seat *seat) {
 
 struct sway_container *seat_get_focus_by_type(struct sway_seat *seat,
                 struct sway_container *container, enum sway_container_type type) {
+        if (container->type == C_VIEW || container->children->length == 0) {
+                return container;
+        }
+
         struct sway_seat_container *current = NULL;
-        struct sway_container *parent = NULL;
         wl_list_for_each(current, &seat->focus_stack, link) {
-                parent = current->container->parent;
-
-                if (current->container == container &&
-                                (type == C_TYPES || container->type == type)) {
-                        return current->container;
+                if (type != C_TYPES && container->type != type) {
+                        continue;
                 }
 
-                while (parent) {
-                        if (parent == container && (type == C_TYPES ||
-                                                current->container->type == type)) {
-                                return current->container;
-                        }
-                        parent = parent->parent;
+                if (container_has_child(container, current->container)) {
+                        return current->container;
                 }
         }