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

adjust elk layout for outside labels

Browse source
This commit is contained in:
Gavin Nishizawa 2023-06-23 13:58:14 -07:00
parent ce93835777
commit c4d9a6231f
No known key found for this signature in database
GPG key ID: AE3B177777CE55CD
1 changed files with 56 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

56
d2layouts/d2elklayout/layout.go
View file

@ -222,6 +222,24 @@ func Layout(ctx context.Context, g *d2graph.Graph, opts *ConfigurableOpts) (err
} }
width = go2.Max(width, float64(obj.LabelDimensions.Width)) width = go2.Max(width, float64(obj.LabelDimensions.Width))
} }
// reserve spacing for outside labels
if obj.HasLabel() && obj.LabelPosition != nil && !obj.HasOutsideBottomLabel() {
position := label.Position(*obj.LabelPosition)
if position.IsShapePosition() {
switch position {
case label.OutsideTopLeft, label.OutsideTopCenter, label.OutsideTopRight,
label.OutsideBottomLeft, label.OutsideBottomCenter, label.OutsideBottomRight:
height += float64(obj.LabelDimensions.Height) + label.PADDING
}
switch position {
case label.OutsideLeftTop, label.OutsideLeftMiddle, label.OutsideLeftBottom,
label.OutsideRightTop, label.OutsideRightMiddle, label.OutsideRightBottom:
width += float64(obj.LabelDimensions.Width) + label.PADDING
}
}
}
// reserve extra space for 3d/multiple by providing elk the larger dimensions // reserve extra space for 3d/multiple by providing elk the larger dimensions
dx, dy := obj.GetModifierElementAdjustments() dx, dy := obj.GetModifierElementAdjustments()
width += dx width += dx
@ -433,6 +451,44 @@ func Layout(ctx context.Context, g *d2graph.Graph, opts *ConfigurableOpts) (err
byID[obj.AbsID()] = obj byID[obj.AbsID()] = obj
}) })
for _, obj := range g.Objects {
// adjust size and position to account for space reserved for labels
if obj.HasLabel() && obj.LabelPosition != nil && !obj.HasOutsideBottomLabel() {
position := label.Position(*obj.LabelPosition)
if position.IsShapePosition() {
var dx, dy float64
switch position {
case label.OutsideTopLeft, label.OutsideTopCenter, label.OutsideTopRight,
label.OutsideBottomLeft, label.OutsideBottomCenter, label.OutsideBottomRight:
dy = float64(obj.LabelDimensions.Height) + label.PADDING
obj.Height -= dy
}
switch position {
case label.OutsideLeftTop, label.OutsideLeftMiddle, label.OutsideLeftBottom,
label.OutsideRightTop, label.OutsideRightMiddle, label.OutsideRightBottom:
dx = float64(obj.LabelDimensions.Width) + label.PADDING
obj.Width -= dx
}
switch position {
case label.OutsideLeftTop, label.OutsideLeftMiddle, label.OutsideLeftBottom:
obj.TopLeft.X += dx / 2
obj.MoveWithDescendants(dx/2, 0)
case label.OutsideRightTop, label.OutsideRightMiddle, label.OutsideRightBottom:
obj.TopLeft.X += dx / 2
obj.MoveWithDescendants(-dx/2, 0)
}
switch position {
case label.OutsideTopLeft, label.OutsideTopCenter, label.OutsideTopRight:
obj.TopLeft.Y += dy / 2
obj.MoveWithDescendants(0, dy/2)
case label.OutsideBottomLeft, label.OutsideBottomCenter, label.OutsideBottomRight:
obj.TopLeft.Y += dy / 2
obj.MoveWithDescendants(0, -dy/2)
}
}
}
}
for _, edge := range g.Edges { for _, edge := range g.Edges {
e := elkEdges[edge] e := elkEdges[edge]