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

cleanup

Browse source
This commit is contained in:
Gavin Nishizawa 2023-12-12 17:35:40 -08:00
parent 94055a0c77
commit 0aa4418921
No known key found for this signature in database
GPG key ID: AE3B177777CE55CD
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
d2graph/layout.go
View file

@ -334,7 +334,7 @@ func (obj *Object) GetMargin() geo.Spacing {
} }
} }
if obj.Icon != nil && obj.IconPosition != nil && obj.Shape.Value != d2target.ShapeImage { if obj.HasIcon() && obj.IconPosition != nil {
position := label.FromString(*obj.IconPosition) position := label.FromString(*obj.IconPosition)
iconSize := float64(d2target.MAX_ICON_SIZE + label.PADDING) iconSize := float64(d2target.MAX_ICON_SIZE + label.PADDING)
@ -453,7 +453,7 @@ func (edge *Edge) TraceToShape(points []*geo.Point, startIndex, endIndex int) (n
} }
} }
} }
if !overlapsOutsideLabel && edge.Src.Icon != nil && !srcShape.Is(shape.IMAGE_TYPE) { if !overlapsOutsideLabel && edge.Src.HasIcon() {
// assumes IconPosition is set if there is an Icon // assumes IconPosition is set if there is an Icon
iconPosition := label.FromString(*edge.Src.IconPosition) iconPosition := label.FromString(*edge.Src.IconPosition)
if iconPosition.IsOutside() { if iconPosition.IsOutside() {
@ -535,7 +535,7 @@ func (edge *Edge) TraceToShape(points []*geo.Point, startIndex, endIndex int) (n
} }
} }
} }
if !overlapsOutsideLabel && edge.Dst.Icon != nil && !dstShape.Is(shape.IMAGE_TYPE) { if !overlapsOutsideLabel && edge.Dst.HasIcon() {
// assumes IconPosition is set if there is an Icon // assumes IconPosition is set if there is an Icon
iconPosition := label.FromString(*edge.Dst.IconPosition) iconPosition := label.FromString(*edge.Dst.IconPosition)
if iconPosition.IsOutside() { if iconPosition.IsOutside() {

4
d2layouts/d2dagrelayout/layout.go
View file

@ -1351,7 +1351,7 @@ func fitPadding(obj *d2graph.Object) {
} }
} }
} }
if obj.Icon != nil && shapeType != shape.IMAGE_TYPE && obj.IconPosition != nil { if obj.HasIcon() && obj.IconPosition != nil {
iconPosition = label.FromString(*obj.IconPosition) iconPosition = label.FromString(*obj.IconPosition)
switch iconPosition { switch iconPosition {
case label.InsideTopLeft, label.InsideTopCenter, label.InsideTopRight, case label.InsideTopLeft, label.InsideTopCenter, label.InsideTopRight,
@ -1386,7 +1386,7 @@ func fitPadding(obj *d2graph.Object) {
innerBoxes = append(innerBoxes, *childLabelBox) innerBoxes = append(innerBoxes, *childLabelBox)
} }
} }
if child.Icon != nil && child.Shape.Value != d2target.ShapeImage && child.IconPosition != nil { if child.HasIcon() && child.IconPosition != nil {
childIconPosition = label.FromString(*child.IconPosition) childIconPosition = label.FromString(*child.IconPosition)
if childIconPosition.IsOutside() { if childIconPosition.IsOutside() {
childIconTL := child.GetIconTopLeft() childIconTL := child.GetIconTopLeft()