diff --git a/d2renderers/d2sketch/sketch.go b/d2renderers/d2sketch/sketch.go index 0d7659a79..457d6e560 100644 --- a/d2renderers/d2sketch/sketch.go +++ b/d2renderers/d2sketch/sketch.go @@ -124,7 +124,7 @@ func DoubleRect(r *Runner, shape d2target.Shape) (string, error) { stroke: "%s", strokeWidth: %d, %s - });`, shape.Width-10, shape.Height-10, shape.Fill, shape.Stroke, shape.StrokeWidth, baseRoughProps) + });`, shape.Width-d2target.INNER_BORDER_OFFSET*2, shape.Height-d2target.INNER_BORDER_OFFSET*2, shape.Fill, shape.Stroke, shape.StrokeWidth, baseRoughProps) pathsSmallRect, err := computeRoughPaths(r, jsSmallRect) if err != nil { return "", err @@ -139,7 +139,7 @@ func DoubleRect(r *Runner, shape d2target.Shape) (string, error) { for _, p := range pathsSmallRect { output += fmt.Sprintf( ``, - shape.Pos.X+5, shape.Pos.Y+5, p, shapeStyle(shape), + shape.Pos.X+d2target.INNER_BORDER_OFFSET, shape.Pos.Y+d2target.INNER_BORDER_OFFSET, p, shapeStyle(shape), ) } output += fmt.Sprintf( @@ -186,7 +186,7 @@ func DoubleOval(r *Runner, shape d2target.Shape) (string, error) { stroke: "%s", strokeWidth: %d, %s - });`, shape.Width/2, shape.Height/2, shape.Width-15, shape.Height-15, shape.Fill, shape.Stroke, shape.StrokeWidth, baseRoughProps) + });`, shape.Width/2, shape.Height/2, shape.Width-d2target.INNER_BORDER_OFFSET*2, shape.Height-d2target.INNER_BORDER_OFFSET*2, shape.Fill, shape.Stroke, shape.StrokeWidth, baseRoughProps) pathsBigCircle, err := computeRoughPaths(r, jsBigCircle) if err != nil { return "", err diff --git a/d2renderers/d2svg/d2svg.go b/d2renderers/d2svg/d2svg.go index 959524387..9d72bcf77 100644 --- a/d2renderers/d2svg/d2svg.go +++ b/d2renderers/d2svg/d2svg.go @@ -719,7 +719,7 @@ func drawShape(writer io.Writer, targetShape d2target.Shape, sketchRunner *d2ske fmt.Fprintf(writer, ``, targetShape.Pos.X+10, targetShape.Pos.Y-10, targetShape.Width, targetShape.Height, style) fmt.Fprintf(writer, ``, - targetShape.Pos.X+15, targetShape.Pos.Y-5, targetShape.Width-10, targetShape.Height-10, style) + targetShape.Pos.X+10+d2target.INNER_BORDER_OFFSET, targetShape.Pos.Y-10+d2target.INNER_BORDER_OFFSET, targetShape.Width-2*d2target.INNER_BORDER_OFFSET, targetShape.Height-2*d2target.INNER_BORDER_OFFSET, style) } if sketchRunner != nil { out, err := d2sketch.DoubleRect(sketchRunner, targetShape) @@ -731,7 +731,7 @@ func drawShape(writer io.Writer, targetShape d2target.Shape, sketchRunner *d2ske fmt.Fprintf(writer, ``, targetShape.Pos.X, targetShape.Pos.Y, targetShape.Width, targetShape.Height, style) fmt.Fprintf(writer, ``, - targetShape.Pos.X+5, targetShape.Pos.Y+5, targetShape.Width-10, targetShape.Height-10, style) + targetShape.Pos.X+d2target.INNER_BORDER_OFFSET, targetShape.Pos.Y+d2target.INNER_BORDER_OFFSET, targetShape.Width-2*d2target.INNER_BORDER_OFFSET, targetShape.Height-2*d2target.INNER_BORDER_OFFSET, style) } } } diff --git a/d2target/d2target.go b/d2target/d2target.go index 6a16f5a7d..029699718 100644 --- a/d2target/d2target.go +++ b/d2target/d2target.go @@ -24,6 +24,8 @@ const ( var BorderOffset = geo.NewVector(5, 5) +const INNER_BORDER_OFFSET = 5 + type Diagram struct { Name string `json:"name"` Description string `json:"description,omitempty"`