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 12:15:28 -07:00
parent 42988d5f90
commit b3713d1fa7
No known key found for this signature in database
GPG key ID: AE3B177777CE55CD
1 changed files with 66 additions and 73 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

83
d2layouts/d2elklayout/layout.go
View file

@ -892,25 +892,44 @@ func (padding shapePadding) mergePadding(position label.Position, width, height
} }
func adjustPadding(obj *d2graph.Object, width, height float64, padding shapePadding) shapePadding { func adjustPadding(obj *d2graph.Object, width, height float64, padding shapePadding) shapePadding {
if obj.IsContainer() || obj.Icon != nil { // TODO don't need to check Icon?
if !obj.IsContainer() && obj.Icon == nil {
return padding
}
contentBox := geo.NewBox(geo.NewPoint(0, 0), float64(width), float64(height)) contentBox := geo.NewBox(geo.NewPoint(0, 0), float64(width), float64(height))
shapeType := d2target.DSL_SHAPE_TO_SHAPE_TYPE[obj.Shape.Value] shapeType := d2target.DSL_SHAPE_TO_SHAPE_TYPE[obj.Shape.Value]
s := shape.NewShape(shapeType, contentBox) s := shape.NewShape(shapeType, contentBox)
innerBox := s.GetInnerBox() innerBox := s.GetInnerBox()
// If the shape inner box + label/icon height becomes greater than the default padding, we want to use that
//
// ┌OUTER───────────────────────────┬────────────────────────────────────────────┐
// │ │ │
// │ ┌INNER──────── ┬ ─────────────│───────────────────────────────────────┐ │
// │ │ │Label Padding │ │ │
// │ │ ┌LABEL─ ┴ ─────────────│───────┐┬ ┌ICON── ┬ ────┐ │ │
// │ │ │ │ ││ │ │ │ │ │
// │ │ │ │ ││Label Height │ Icon│ │ │ │
// │ │ │ │ ││ │ Height│ │ │ │
// │ │ └──────────────────────│───────┘┴ │ │ │ │ │
// │ │ │ └────── ┴ ────┘ │ │
// │ │ │ │ │
// │ │ ┴Default ELK Padding │ │
// │ │ ┌CHILD────────────────────────────────────────────────────────┐ │ │
// │ │ │ │ │ │
// │ │ │ │ │ │
// │ │ │ │ │ │
// │ │ └─────────────────────────────────────────────────────────────┘ │ │
// │ │ │ │
// │ └─────────────────────────────────────────────────────────────────────┘ │
// │ │
// └─────────────────────────────────────────────────────────────────────────────┘
// base padding // base padding
padding.top = go2.Max(padding.top, innerTop := int(math.Ceil(innerBox.TopLeft.Y))
int(math.Ceil(innerBox.TopLeft.Y)), innerBottom := int(math.Ceil(height - (innerBox.TopLeft.Y + innerBox.Height)))
) innerLeft := int(math.Ceil(innerBox.TopLeft.X))
padding.bottom = go2.Max(padding.bottom, innerRight := int(math.Ceil(width - (innerBox.TopLeft.X + innerBox.Width)))
int(math.Ceil(height-(innerBox.TopLeft.Y+innerBox.Height))),
)
padding.left = go2.Max(padding.left,
int(math.Ceil(innerBox.TopLeft.X)),
)
padding.right = go2.Max(padding.right,
int(math.Ceil(width-(innerBox.TopLeft.X+innerBox.Width))),
)
// additional padding for label/icon // additional padding for label/icon
labelHeight := 0 labelHeight := 0
@ -923,6 +942,7 @@ func adjustPadding(obj *d2graph.Object, width, height float64, padding shapePadd
} }
var extraTop, extraBottom int var extraTop, extraBottom int
// TODO left right
if obj.LabelPosition != nil { if obj.LabelPosition != nil {
switch label.Position(*obj.LabelPosition) { switch label.Position(*obj.LabelPosition) {
case label.InsideTopLeft, label.InsideTopCenter, label.InsideTopRight: case label.InsideTopLeft, label.InsideTopCenter, label.InsideTopRight:
@ -939,38 +959,11 @@ func adjustPadding(obj *d2graph.Object, width, height float64, padding shapePadd
extraBottom = go2.Max(extraBottom, iconHeight) extraBottom = go2.Max(extraBottom, iconHeight)
} }
} }
padding.top += extraTop
padding.bottom += extraBottom
// TODO find better solution to handle attempts to adjust diamond inner box with padding padding.top = go2.Max(padding.top, innerTop+extraTop)
if shapeType == shape.DIAMOND_TYPE { padding.bottom = go2.Max(padding.bottom, innerBottom+extraBottom)
padding.top += go2.Max(labelHeight/2, iconHeight/2) padding.left = go2.Max(padding.left, innerLeft)
} padding.right = go2.Max(padding.right, innerRight)
}
if obj.HasLabel() {
position := label.Position(*obj.LabelPosition)
if !position.IsOutside() {
// Inside padding
padding = padding.mergePadding(
position,
obj.LabelDimensions.Width+2*label.PADDING,
obj.LabelDimensions.Height+2*label.PADDING,
)
}
}
if obj.Icon != nil {
position := label.Position(*obj.IconPosition)
if !position.IsOutside() {
// Inside padding
padding = padding.mergePadding(
position,
d2target.MAX_ICON_SIZE+2*label.PADDING,
d2target.MAX_ICON_SIZE+2*label.PADDING,
)
}
}
return padding return padding
} }