luciano/d2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix: default border-radius for BaseConnection

Browse source
This commit is contained in:
donglixiaoche 2023-03-01 08:02:35 +08:00
parent 776b6af1bc
commit e88c60fe55
No known key found for this signature in database
GPG key ID: F235CD35048B3752
3 changed files with 7 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
d2exporter/export.go
View file

@ -208,8 +208,6 @@ func toConnection(edge *d2graph.Edge) d2target.Connection {
if edge.Attributes.Style.BorderRadius != nil { if edge.Attributes.Style.BorderRadius != nil {
connection.BorderRadius, _ = strconv.ParseFloat(edge.Attributes.Style.BorderRadius.Value, 64) connection.BorderRadius, _ = strconv.ParseFloat(edge.Attributes.Style.BorderRadius.Value, 64)
} else {
connection.BorderRadius = -1
} }
if edge.Attributes.Style.Opacity != nil { if edge.Attributes.Style.Opacity != nil {

3
d2renderers/d2svg/d2svg.go
View file

@ -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) dist := geo.EuclideanDistance(prevTarget.X, prevTarget.Y, currTarget.X, currTarget.Y)
connectionBorderRadius := connection.BorderRadius connectionBorderRadius := connection.BorderRadius
if connectionBorderRadius < 0 {
connectionBorderRadius = 10
}
units := math.Min(connectionBorderRadius, dist/2) units := math.Min(connectionBorderRadius, dist/2)
prevTranslations := prevVector.Unit().Multiply(units).ToPoint() prevTranslations := prevVector.Unit().Multiply(units).ToPoint()

13
d2target/d2target.go
View file

@ -316,12 +316,13 @@ type Connection struct {
func BaseConnection() *Connection { func BaseConnection() *Connection {
return &Connection{ return &Connection{
SrcArrow: NoArrowhead, SrcArrow: NoArrowhead,
DstArrow: NoArrowhead, DstArrow: NoArrowhead,
Route: make([]*geo.Point, 0), Route: make([]*geo.Point, 0),
Opacity: 1, Opacity: 1,
StrokeDash: 0, StrokeDash: 0,
StrokeWidth: 2, StrokeWidth: 2,
BorderRadius: 10,
Text: Text{ Text: Text{
Italic: true, Italic: true,
FontFamily: "DEFAULT", FontFamily: "DEFAULT",