Remove container_has_child

In all cases you can use container_has_ancestor with the arguments
swapped, which is faster than container_has_child.
This commit is contained in:
Ryan Dwyer 2018-08-11 15:36:19 +10:00
parent e474d87e42
commit 31844bf42b
3 changed files with 3 additions and 22 deletions

View file

@ -145,14 +145,14 @@ static struct sway_container *seat_get_focus_by_type(struct sway_seat *seat,
continue;
}
if (container_has_child(container, current->container)) {
if (container_has_ancestor(current->container, container)) {
if (only_tiling &&
container_is_floating_or_child(current->container)) {
continue;
}
return current->container;
}
if (floating && container_has_child(floating, current->container)) {
if (floating && container_has_ancestor(current->container, floating)) {
return current->container;
}
}
@ -190,7 +190,7 @@ static void handle_seat_container_destroy(struct wl_listener *listener,
bool set_focus =
focus != NULL &&
(focus == con || container_has_child(con, focus)) &&
(focus == con || container_has_ancestor(focus, con)) &&
con->type != C_WORKSPACE;
seat_container_destroy(seat_con);