Merge pull request #2448 from RyanDwyer/remove-container-has-child

Remove container_has_child

1 files changed, 3 insertions, 3 deletions

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);