Adjust padding per shape

d2graph/d2graph.go

@@ -1157,6 +1157,18 @@ func (g *Graph) SetDimensions(mtexts []*d2target.MText, ruler *textmeasure.Ruler
 			}
 		}
 
+		// give shapes with icons extra padding
+		if obj.Attributes.Icon != nil {
+			paddingX += 20
+			paddingY += 20
+		}
+		if obj.Attributes.Link != "" {
+			paddingX += 32
+		}
+		if obj.Attributes.Tooltip != "" {
+			paddingX += 32
+		}
+
 		if desiredWidth == 0 && desiredHeight == 0 {
 			newWidth, newHeight := s.GetDimensionsToFit(contentBox.Width, contentBox.Height, paddingX, paddingY)
 			obj.Width = newWidth

lib/shape/shape.go

@@ -31,6 +31,8 @@ const (
 	TEXT_TYPE  = "Text"
 	CODE_TYPE  = "Code"
 	IMAGE_TYPE = "Image"
+
+	defaultPadding = 40.
 )
 
 type Shape interface {
@@ -101,7 +103,7 @@ func (s baseShape) GetDimensionsToFit(width, height, paddingX, paddingY float64)
 }
 
 func (s baseShape) GetDefaultPadding() (paddingX, paddingY float64) {
-	return 100., 100.
+	return defaultPadding, defaultPadding
 }
 
 func (s baseShape) Perimeter() []geo.Intersectable {

lib/shape/shape_callout.go

@@ -82,3 +82,7 @@ func (s shapeCallout) GetDimensionsToFit(width, height, paddingX, paddingY float
 	}
 	return width + paddingX, baseHeight
 }
+
+func (s shapeCallout) GetDefaultPadding() (paddingX, paddingY float64) {
+	return defaultPadding, defaultPadding / 2
+}

lib/shape/shape_circle.go

@@ -45,3 +45,7 @@ func (s shapeCircle) GetInsidePlacement(width, height, padding float64) geo.Poin
 func (s shapeCircle) Perimeter() []geo.Intersectable {
 	return []geo.Intersectable{geo.NewEllipse(s.Box.Center(), s.Box.Width/2, s.Box.Height/2)}
 }
+
+func (s shapeCircle) GetDefaultPadding() (paddingX, paddingY float64) {
+	return defaultPadding / 2, defaultPadding / 2
+}

lib/shape/shape_cloud.go

@@ -119,5 +119,5 @@ func (s shapeCloud) GetSVGPathData() []string {
 }
 
 func (s shapeCloud) GetDefaultPadding() (paddingX, paddingY float64) {
-	return 50, 50
+	return defaultPadding, defaultPadding / 2
 }

lib/shape/shape_cylinder.go

@@ -82,3 +82,7 @@ func (s shapeCylinder) GetDimensionsToFit(width, height, paddingX, paddingY floa
 	totalHeight := height + paddingY + 3*defaultArcDepth
 	return width + paddingX, totalHeight
 }
+
+func (s shapeCylinder) GetDefaultPadding() (paddingX, paddingY float64) {
+	return defaultPadding, defaultPadding / 2
+}

lib/shape/shape_diamond.go

@@ -60,3 +60,7 @@ func (s shapeDiamond) GetDimensionsToFit(width, height, paddingX, paddingY float
 	totalHeight := 2 * (height + paddingY)
 	return totalWidth, totalHeight
 }
+
+func (s shapeDiamond) GetDefaultPadding() (paddingX, paddingY float64) {
+	return defaultPadding / 4, defaultPadding / 2
+}

lib/shape/shape_document.go

@@ -53,6 +53,10 @@ func (s shapeDocument) GetSVGPathData() []string {
 }
 
 func (s shapeDocument) GetDimensionsToFit(width, height, paddingX, paddingY float64) (float64, float64) {
-	baseHeight := (height + paddingX) * docPathHeight / docPathInnerBottom
+	baseHeight := (height + paddingY) * docPathHeight / docPathInnerBottom
-	return width + paddingY, baseHeight
+	return width + paddingX, baseHeight
+}
+
+func (s shapeDocument) GetDefaultPadding() (paddingX, paddingY float64) {
+	return defaultPadding, defaultPadding * docPathInnerBottom / docPathHeight
 }

lib/shape/shape_hexagon.go

@@ -53,3 +53,7 @@ func (s shapeHexagon) GetDimensionsToFit(width, height, paddingX, paddingY float
 	totalWidth := 2 * (width + paddingX)
 	return totalWidth, height + paddingY
 }
+
+func (s shapeHexagon) GetDefaultPadding() (paddingX, paddingY float64) {
+	return defaultPadding / 4, defaultPadding
+}

lib/shape/shape_package.go

@@ -82,3 +82,7 @@ func (s shapePackage) GetDimensionsToFit(width, height, paddingX, paddingY float
 
 	return width + paddingX, totalHeight
 }
+
+func (s shapePackage) GetDefaultPadding() (paddingX, paddingY float64) {
+	return defaultPadding, .8 * defaultPadding
+}

lib/shape/shape_page.go

@@ -97,3 +97,7 @@ func (s shapePage) GetDimensionsToFit(width, height, paddingX, paddingY float64)
 	totalHeight = math.Max(totalHeight, pageCornerHeight)
 	return totalWidth, totalHeight
 }
+
+func (s shapePage) GetDefaultPadding() (paddingX, paddingY float64) {
+	return defaultPadding, pageCornerHeight + defaultPadding
+}

lib/shape/shape_person.go

@@ -74,3 +74,7 @@ func (s shapePerson) GetDimensionsToFit(width, height, paddingX, paddingY float6
 	totalHeight := height + paddingY
 	return totalWidth, totalHeight
 }
+
+func (s shapePerson) GetDefaultPadding() (paddingX, paddingY float64) {
+	return 10, defaultPadding
+}

lib/shape/shape_queue.go

@@ -78,3 +78,7 @@ func (s shapeQueue) GetDimensionsToFit(width, height, paddingX, paddingY float64
 	totalWidth := 3*defaultArcDepth + width + paddingX
 	return totalWidth, height + paddingY
 }
+
+func (s shapeQueue) GetDefaultPadding() (paddingX, paddingY float64) {
+	return defaultPadding / 2, defaultPadding
+}

lib/shape/shape_step.go

@@ -58,3 +58,7 @@ func (s shapeStep) GetDimensionsToFit(width, height, paddingX, paddingY float64)
 	totalWidth := width + paddingX + 2*STEP_WEDGE_WIDTH
 	return totalWidth, height + paddingY
 }
+
+func (s shapeStep) GetDefaultPadding() (paddingX, paddingY float64) {
+	return defaultPadding / 4, defaultPadding + STEP_WEDGE_WIDTH
+}

lib/shape/shape_stored_data.go

@@ -60,3 +60,7 @@ func (s shapeStoredData) GetDimensionsToFit(width, height, paddingX, paddingY fl
 	totalWidth := width + paddingX + 2*storedDataWedgeWidth
 	return totalWidth, height + paddingY
 }
+
+func (s shapeStoredData) GetDefaultPadding() (paddingX, paddingY float64) {
+	return defaultPadding - 10, defaultPadding
+}