mirror of
https://github.com/swaywm/sway.git
synced 2024-11-26 18:01:29 +00:00
Merge pull request #952 from SirCmpwn/revert-948-floating-titlebar-click
Revert "also check floating cons in container_find"
This commit is contained in:
commit
857eea8b63
|
@ -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;
|
||||
}
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in a new issue