From e55075fc37ae66d738ecb44ccaad440a536cabce Mon Sep 17 00:00:00 2001
From: Gavin Nishizawa <gavin@terrastruct.com>
Date: Tue, 26 Sep 2023 17:42:42 -0700
Subject: [PATCH] cleanup

---
 d2layouts/d2grid/layout.go | 23 ++++++-----------------
 1 file changed, 6 insertions(+), 17 deletions(-)

diff --git a/d2layouts/d2grid/layout.go b/d2layouts/d2grid/layout.go
index 52910a0ec..d5c220f90 100644
--- a/d2layouts/d2grid/layout.go
+++ b/d2layouts/d2grid/layout.go
@@ -144,7 +144,7 @@ func layoutGrid(g *d2graph.Graph, obj *d2graph.Object) (*gridDiagram, error) {
 
 	// to handle objects with outside labels, we adjust their dimensions before layout and
 	// after layout, we remove the label adjustment and reposition TopLeft if needed
-	revertTemporary := gd.sizeForOutsideLabels()
+	revertAdjustments := gd.sizeForOutsideLabels()
 
 	if gd.rows != 0 && gd.columns != 0 {
 		gd.layoutEvenly(g, obj)
@@ -152,7 +152,7 @@ func layoutGrid(g *d2graph.Graph, obj *d2graph.Object) (*gridDiagram, error) {
 		gd.layoutDynamic(g, obj)
 	}
 
-	revertTemporary()
+	revertAdjustments()
 
 	// position labels and icons
 	for _, o := range gd.objects {
@@ -841,26 +841,15 @@ func getDistToTarget(layout [][]*d2graph.Object, targetSize float64, horizontalG
 	return totalDelta
 }
 
-func (gd *gridDiagram) sizeForOutsideLabels() (revertTemp func()) {
+func (gd *gridDiagram) sizeForOutsideLabels() (revert func()) {
 	margins := make(map[*d2graph.Object]geo.Spacing)
 
 	for _, o := range gd.objects {
 		margin := o.GetMargin()
-
-		if margin.Top > 0 {
-			o.Height += margin.Top
-		}
-		if margin.Bottom > 0 {
-			o.Height += margin.Bottom
-		}
-		if margin.Left > 0 {
-			o.Width += margin.Left
-		}
-		if margin.Right > 0 {
-			o.Width += margin.Right
-		}
-
 		margins[o] = margin
+
+		o.Height += margin.Top + margin.Bottom
+		o.Width += margin.Left + margin.Right
 	}
 
 	return func() {