diff options
| author | Claudia <claui@users.noreply.github.com> | 2025-03-26 19:34:44 +0100 |
|---|---|---|
| committer | Kenny Levinsen <kl@kl.wtf> | 2025-03-27 08:09:53 +0100 |
| commit | a25645a5a6e205fccee1ca5abc00f8ee31b3bf44 (patch) | |
| tree | 9cdf42ad567985bc869537ce54b7b26e0c5ed877 | |
| parent | ab455bbadae5f115262161c165fdd46d1cc4295d (diff) | |
Fix tabbed/stacking container height regression
Commit c2d6aff added a bounds check on `height - title_bar_height`,
repurposing the local variable `height` in an attempt to DRY out the
expression.
However, because re-assignment occurs inside the loop body, its result
would leak across loop iterations, compounding its effect and leading
to the artifact reported in issue #8625, where each child except the
first in a tabbed container would acquire a visible waterline.
Introduce a second variable and reset it in each loop iteration to get
rid of the waterline.
Fixes #8625.
| -rw-r--r-- | sway/desktop/transaction.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/sway/desktop/transaction.c b/sway/desktop/transaction.c index 16ce8e2e..01fe3128 100644 --- a/sway/desktop/transaction.c +++ b/sway/desktop/transaction.c @@ -312,9 +312,9 @@ static void arrange_children(enum sway_container_layout layout, list_t *children wlr_scene_node_set_position(&child->scene_tree->node, 0, title_bar_height); wlr_scene_node_reparent(&child->scene_tree->node, content); - height -= title_bar_height; - if (activated && width > 0 && height > 0) { - arrange_container(child, width, height, title_bar_height == 0, 0); + int net_height = height - title_bar_height; + if (activated && width > 0 && net_height > 0) { + arrange_container(child, width, net_height, title_bar_height == 0, 0); } else { disable_container(child); } @@ -341,9 +341,9 @@ static void arrange_children(enum sway_container_layout layout, list_t *children wlr_scene_node_set_position(&child->scene_tree->node, 0, title_height); wlr_scene_node_reparent(&child->scene_tree->node, content); - height -= title_bar_height; - if (activated && width > 0 && height > 0) { - arrange_container(child, width, height, title_bar_height == 0, 0); + int net_height = height - title_bar_height; + if (activated && width > 0 && net_height > 0) { + arrange_container(child, width, net_height, title_bar_height == 0, 0); } else { disable_container(child); } |