From 126a82f14ff47925c7f88523ed9abe0ae9aeb7e8 Mon Sep 17 00:00:00 2001
From: Ryan Dwyer <ryandwyer1@gmail.com>
Date: Tue, 28 Aug 2018 23:53:51 +1000
Subject: Fix gaps issues

* In layout command, arrange parent of parent - not sure why this is
needed but it is
* Remove gap adjustment when rendering
* Workspace should use outer gaps, not inner
* Add exceptions for tabbed and stacked containers
* Don't mess with gap state when splitting a container
---
 sway/desktop/render.c | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

(limited to 'sway/desktop')

diff --git a/sway/desktop/render.c b/sway/desktop/render.c
index b52dd196..5556e5b3 100644
--- a/sway/desktop/render.c
+++ b/sway/desktop/render.c
@@ -619,9 +619,7 @@ static void render_container_tabbed(struct sway_output *output,
 	struct sway_container *current = pstate->focused_inactive_child;
 	struct border_colors *current_colors = &config->border_colors.unfocused;
 
-	double width_gap_adjustment = 2 * pstate->current_gaps;
-	int tab_width =
-		(pstate->swayc_width - width_gap_adjustment) / pstate->children->length;
+	int tab_width = (pstate->swayc_width) / pstate->children->length;
 
 	// Render tabs
 	for (int i = 0; i < pstate->children->length; ++i) {
@@ -656,8 +654,7 @@ 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 - width_gap_adjustment - tab_width * i;
+			tab_width = pstate->swayc_width - tab_width * i;
 		}
 
 		render_titlebar(output, damage, child, x, pstate->swayc_y, tab_width,
-- 
cgit v1.2.3