Revert "Merge pull request #952 from SirCmpwn/revert-948-floating-titlebar-click"

This reverts commit 857eea8b63, reversing
changes made to ce713efcd2.
This commit is contained in:
Drew DeVault 2016-10-12 21:54:19 -04:00
parent 15a67e57b0
commit 56a7e5fbce

View file

@ -727,14 +727,29 @@ swayc_t *container_find(swayc_t *container, bool (*f)(swayc_t *, const void *),
return NULL; return NULL;
} }
for (int i = 0; i < container->children->length; ++i) { swayc_t *con;
if (f(container->children->items[i], data)) { if (container->type == C_WORKSPACE) {
return container->children->items[i]; 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;
}
}
} }
swayc_t *find = container_find(container->children->items[i], f, data); for (int i = 0; i < container->children->length; ++i) {
if (find != NULL) { con = container->children->items[i];
return find; if (f(con, data)) {
return con;
}
con = container_find(con, f, data);
if (con != NULL) {
return con;
} }
} }