From f6e218a64371b02afdf6b7812a52d70b13635ef3 Mon Sep 17 00:00:00 2001 From: Ryan Dwyer Date: Sun, 16 Sep 2018 22:01:54 +1000 Subject: Rename seat_get_active_child to seat_get_active_tiling_child Also renames container to con in one function to prevent ugly line wrapping. --- sway/tree/view.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'sway/tree/view.c') diff --git a/sway/tree/view.c b/sway/tree/view.c index 78f85de2..e4e1c161 100644 --- a/sway/tree/view.c +++ b/sway/tree/view.c @@ -1001,17 +1001,17 @@ bool view_is_visible(struct sway_view *view) { bool is_sticky = container_is_floating(floater) && floater->is_sticky; // Check view isn't in a tabbed or stacked container on an inactive tab struct sway_seat *seat = input_manager_current_seat(input_manager); - struct sway_container *container = view->container; - while (container) { - enum sway_container_layout layout = container_parent_layout(container); + struct sway_container *con = view->container; + while (con) { + enum sway_container_layout layout = container_parent_layout(con); if (layout == L_TABBED || layout == L_STACKED) { - struct sway_node *parent = container->parent ? - &container->parent->node : &container->workspace->node; - if (seat_get_active_child(seat, parent) != &container->node) { + struct sway_node *parent = con->parent ? + &con->parent->node : &con->workspace->node; + if (seat_get_active_tiling_child(seat, parent) != &con->node) { return false; } } - container = container->parent; + con = con->parent; } // Check view isn't hidden by another fullscreen view if (workspace->fullscreen && -- cgit v1.2.3