diff --git a/include/container.h b/include/container.h index ae57d1e38..d1905720f 100644 --- a/include/container.h +++ b/include/container.h @@ -251,11 +251,6 @@ bool swayc_is_parent_of(swayc_t *parent, swayc_t *child); */ bool swayc_is_child_of(swayc_t *child, swayc_t *parent); -/** - * Returns true if view is stacked or tabbed. - */ -bool swayc_is_tabbed_stacked(swayc_t *view); - /** * Returns the top most tabbed or stacked parent container. Returns NULL if * view is not in a tabbed/stacked layout. diff --git a/sway/container.c b/sway/container.c index d54dfd961..b49b32ee1 100644 --- a/sway/container.c +++ b/sway/container.c @@ -725,7 +725,8 @@ void update_visibility_output(swayc_t *container, wlc_handle output) { swayc_t *parent = container->parent; container->visible = parent->visible; // special cases where visibility depends on focus - if (parent->type == C_OUTPUT || swayc_is_tabbed_stacked(container)) { + if (parent->type == C_OUTPUT || parent->layout == L_TABBED || + parent->layout == L_STACKED) { container->visible = parent->focused == container && parent->visible; } // Set visibility and output for view @@ -813,11 +814,6 @@ void close_views(swayc_t *container) { container_map(container, close_view, NULL); } -bool swayc_is_tabbed_stacked(swayc_t *view) { - return (view->parent->layout == L_TABBED - || view->parent->layout == L_STACKED); -} - swayc_t *swayc_tabbed_stacked_parent(swayc_t *view) { swayc_t *parent = NULL; if (!ASSERT_NONNULL(view)) {