Merge pull request #2241 from rustysec/master

fix tabbed titlebar widths

1 files changed, 5 insertions, 2 deletions

diff --git a/sway/desktop/render.c b/sway/desktop/render.c
index f554b813..28c81942 100644
--- a/sway/desktop/render.c
+++ b/sway/desktop/render.c
@@ -599,7 +599,9 @@ static void render_container_tabbed(struct sway_output *output,
         struct border_colors *current_colors = &config->border_colors.unfocused;
         struct sway_container_state *pstate = &con->current;
 
-        int tab_width = pstate->swayc_width / pstate->children->length;
+        double width_gap_adjustment = 2 * pstate->current_gaps;
+        int tab_width =
+                (pstate->swayc_width - width_gap_adjustment) / pstate->children->length;
 
         // Render tabs
         for (int i = 0; i < pstate->children->length; ++i) {
@@ -628,7 +630,8 @@ static void render_container_tabbed(struct sway_output *output,
 
                 // Make last tab use the remaining width of the parent
                 if (i == pstate->children->length - 1) {
-                        tab_width = pstate->swayc_width - tab_width * i;
+                        tab_width =
+                                pstate->swayc_width - width_gap_adjustment - tab_width * i;
                 }
 
                 render_titlebar(output, damage, child, x, cstate->swayc_y, tab_width,