From f30f60dad8c60c41c0aa8834d81a3f5127f2c154 Mon Sep 17 00:00:00 2001 From: Drew DeVault Date: Wed, 12 Oct 2016 12:19:02 -0400 Subject: [PATCH] Revert "also check floating cons in container_find" --- sway/container.c | 25 +++++-------------------- 1 file changed, 5 insertions(+), 20 deletions(-) diff --git a/sway/container.c b/sway/container.c index c588f3dbf..c3461acb6 100644 --- a/sway/container.c +++ b/sway/container.c @@ -729,29 +729,14 @@ swayc_t *container_find(swayc_t *container, bool (*f)(swayc_t *, const void *), return NULL; } - swayc_t *con; - if (container->type == C_WORKSPACE) { - for (int i = 0; i < container->floating->length; ++i) { - con = container->floating->items[i]; - if (f(con, data)) { - return con; - } - con = container_find(con, f, data); - if (con != NULL) { - return con; - } - } - } - for (int i = 0; i < container->children->length; ++i) { - con = container->children->items[i]; - if (f(con, data)) { - return con; + if (f(container->children->items[i], data)) { + return container->children->items[i]; } - con = container_find(con, f, data); - if (con != NULL) { - return con; + swayc_t *find = container_find(container->children->items[i], f, data); + if (find != NULL) { + return find; } }