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

fix

Browse source
This commit is contained in:
Gavin Nishizawa 2023-06-27 13:40:04 -07:00
parent e2289fb13f
commit d85c1e9f3b
No known key found for this signature in database
GPG key ID: AE3B177777CE55CD
1 changed files with 10 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
d2layouts/d2elklayout/layout.go
View file

@ -1009,8 +1009,8 @@ func adjustDimensions(obj *d2graph.Object) (width, height float64) {
} }
} }
// reserve extra if there's also an icon // special handling
if obj.Icon != nil && obj.Shape.Value != d2target.ShapeImage { if obj.HasOutsideBottomLabel() || obj.Icon != nil {
height += float64(obj.LabelDimensions.Height) + label.PADDING height += float64(obj.LabelDimensions.Height) + label.PADDING
} }
} }
@ -1082,6 +1082,11 @@ func cleanupAdjustment(obj *d2graph.Object) {
} }
} }
// special handling to start/end connections below label
if obj.HasOutsideBottomLabel() {
obj.Height -= float64(obj.LabelDimensions.Height) + label.PADDING
}
// remove the extra width/height we added for 3d/multiple after all objects/connections are placed // remove the extra width/height we added for 3d/multiple after all objects/connections are placed
// and shift the shapes down accordingly // and shift the shapes down accordingly
dx, dy := obj.GetModifierElementAdjustments() dx, dy := obj.GetModifierElementAdjustments()
@ -1096,17 +1101,18 @@ func cleanupAdjustment(obj *d2graph.Object) {
} }
func positionLabelsIcons(obj *d2graph.Object) { func positionLabelsIcons(obj *d2graph.Object) {
if obj.Icon != nil && obj.Attributes.IconPosition == nil { if obj.Icon != nil && obj.IconPosition == nil {
if len(obj.ChildrenArray) > 0 { if len(obj.ChildrenArray) > 0 {
obj.IconPosition = go2.Pointer(string(label.InsideTopLeft)) obj.IconPosition = go2.Pointer(string(label.InsideTopLeft))
if obj.LabelPosition == nil { if obj.LabelPosition == nil {
obj.LabelPosition = go2.Pointer(string(label.InsideTopRight)) obj.LabelPosition = go2.Pointer(string(label.InsideTopRight))
return
} }
} else { } else {
obj.IconPosition = go2.Pointer(string(label.InsideMiddleCenter)) obj.IconPosition = go2.Pointer(string(label.InsideMiddleCenter))
} }
} }
if obj.HasLabel() && obj.Attributes.LabelPosition == nil { if obj.HasLabel() && obj.LabelPosition == nil {
if len(obj.ChildrenArray) > 0 { if len(obj.ChildrenArray) > 0 {
obj.LabelPosition = go2.Pointer(string(label.InsideTopCenter)) obj.LabelPosition = go2.Pointer(string(label.InsideTopCenter))
} else if obj.HasOutsideBottomLabel() { } else if obj.HasOutsideBottomLabel() {