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

1 files changed, 9 insertions, 1 deletions

diff --git a/sway/tree/workspace.c b/sway/tree/workspace.c
index d930826e..60256336 100644
--- a/sway/tree/workspace.c
+++ b/sway/tree/workspace.c
@@ -694,7 +694,15 @@ void workspace_add_gaps(struct sway_container *ws) {
 		return;
 	}
 
-	ws->current_gaps = ws->has_gaps ? ws->gaps_inner : config->gaps_inner;
+	ws->current_gaps = ws->has_gaps ? ws->gaps_outer : config->gaps_outer;
+
+	if (ws->layout == L_TABBED || ws->layout == L_STACKED) {
+		// We have to add inner gaps for this, because children of tabbed and
+		// stacked containers don't apply their own gaps - they assume the
+		// tabbed/stacked container is using gaps.
+		ws->current_gaps += ws->has_gaps ? ws->gaps_inner : config->gaps_inner;
+	}
+
 	ws->x += ws->current_gaps;
 	ws->y += ws->current_gaps;
 	ws->width -= 2 * ws->current_gaps;