From ed08f2f20cc533716001829398bdad8f0e98049b Mon Sep 17 00:00:00 2001 From: Tudor Brindus Date: Sun, 31 May 2020 19:03:42 -0400 Subject: tree/view: fix smart gaps when ancestor container is tabbed or stacked Fixes #5406. --- sway/tree/view.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) (limited to 'sway/tree/view.c') diff --git a/sway/tree/view.c b/sway/tree/view.c index 314fd381..03ff89b5 100644 --- a/sway/tree/view.c +++ b/sway/tree/view.c @@ -192,21 +192,22 @@ bool view_inhibit_idle(struct sway_view *view) { || sway_idle_inhibit_v1_is_active(application_inhibitor); } -bool view_is_only_visible(struct sway_view *view) { - bool only_view = true; +bool view_ancestor_is_only_visible(struct sway_view *view) { + bool only_visible = true; struct sway_container *con = view->container; while (con) { enum sway_container_layout layout = container_parent_layout(con); if (layout != L_TABBED && layout != L_STACKED) { list_t *siblings = container_get_siblings(con); if (siblings && siblings->length > 1) { - only_view = false; - break; + only_visible = false; } + } else { + only_visible = true; } con = con->parent; } - return only_view; + return only_visible; } static bool gaps_to_edge(struct sway_view *view) { @@ -247,7 +248,7 @@ void view_autoconfigure(struct sway_view *view) { bool smart = config->hide_edge_borders_smart == ESMART_ON || (config->hide_edge_borders_smart == ESMART_NO_GAPS && !gaps_to_edge(view)); - bool hide_smart = smart && view_is_only_visible(view); + bool hide_smart = smart && view_ancestor_is_only_visible(view); if (config->hide_edge_borders == E_BOTH || config->hide_edge_borders == E_VERTICAL || hide_smart) { -- cgit v1.2.3-54-g00ecf