From 31844bf42bc4b6549862ea4c4f077c1e19d9e7a1 Mon Sep 17 00:00:00 2001 From: Ryan Dwyer Date: Sat, 11 Aug 2018 15:36:19 +1000 Subject: Remove container_has_child In all cases you can use container_has_ancestor with the arguments swapped, which is faster than container_has_child. --- sway/input/seat.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'sway/input') diff --git a/sway/input/seat.c b/sway/input/seat.c index 6dd7cf7d..3cd079f4 100644 --- a/sway/input/seat.c +++ b/sway/input/seat.c @@ -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); -- cgit v1.2.3