From e88c60fe5569db98f51ff8582235729eff5c3173 Mon Sep 17 00:00:00 2001 From: donglixiaoche Date: Wed, 1 Mar 2023 08:02:35 +0800 Subject: [PATCH] fix: default border-radius for BaseConnection --- d2exporter/export.go | 2 -- d2renderers/d2svg/d2svg.go | 3 --- d2target/d2target.go | 13 +++++++------ 3 files changed, 7 insertions(+), 11 deletions(-) diff --git a/d2exporter/export.go b/d2exporter/export.go index 232c9db70..bc84f4246 100644 --- a/d2exporter/export.go +++ b/d2exporter/export.go @@ -208,8 +208,6 @@ func toConnection(edge *d2graph.Edge) d2target.Connection { if edge.Attributes.Style.BorderRadius != nil { connection.BorderRadius, _ = strconv.ParseFloat(edge.Attributes.Style.BorderRadius.Value, 64) - } else { - connection.BorderRadius = -1 } if edge.Attributes.Style.Opacity != nil { diff --git a/d2renderers/d2svg/d2svg.go b/d2renderers/d2svg/d2svg.go index 7752ebb95..b5ff5d8ee 100644 --- a/d2renderers/d2svg/d2svg.go +++ b/d2renderers/d2svg/d2svg.go @@ -421,9 +421,6 @@ func pathData(connection d2target.Connection, srcAdj, dstAdj *geo.Point) string dist := geo.EuclideanDistance(prevTarget.X, prevTarget.Y, currTarget.X, currTarget.Y) connectionBorderRadius := connection.BorderRadius - if connectionBorderRadius < 0 { - connectionBorderRadius = 10 - } units := math.Min(connectionBorderRadius, dist/2) prevTranslations := prevVector.Unit().Multiply(units).ToPoint() diff --git a/d2target/d2target.go b/d2target/d2target.go index 5d2fa6f95..9d79eaa4c 100644 --- a/d2target/d2target.go +++ b/d2target/d2target.go @@ -316,12 +316,13 @@ type Connection struct { func BaseConnection() *Connection { return &Connection{ - SrcArrow: NoArrowhead, - DstArrow: NoArrowhead, - Route: make([]*geo.Point, 0), - Opacity: 1, - StrokeDash: 0, - StrokeWidth: 2, + SrcArrow: NoArrowhead, + DstArrow: NoArrowhead, + Route: make([]*geo.Point, 0), + Opacity: 1, + StrokeDash: 0, + StrokeWidth: 2, + BorderRadius: 10, Text: Text{ Italic: true, FontFamily: "DEFAULT",