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-09-26 17:42:42 -07:00
parent d01ca35751
commit e55075fc37
No known key found for this signature in database
GPG key ID: AE3B177777CE55CD
1 changed files with 6 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
d2layouts/d2grid/layout.go
View file

@ -144,7 +144,7 @@ func layoutGrid(g *d2graph.Graph, obj *d2graph.Object) (*gridDiagram, error) {
// to handle objects with outside labels, we adjust their dimensions before layout and
// after layout, we remove the label adjustment and reposition TopLeft if needed
revertTemporary := gd.sizeForOutsideLabels()
revertAdjustments := gd.sizeForOutsideLabels()
if gd.rows != 0 && gd.columns != 0 {
gd.layoutEvenly(g, obj)
@ -152,7 +152,7 @@ func layoutGrid(g *d2graph.Graph, obj *d2graph.Object) (*gridDiagram, error) {
gd.layoutDynamic(g, obj)
}
revertTemporary()
revertAdjustments()
// position labels and icons
for _, o := range gd.objects {
@ -841,26 +841,15 @@ func getDistToTarget(layout [][]*d2graph.Object, targetSize float64, horizontalG
return totalDelta
}
func (gd *gridDiagram) sizeForOutsideLabels() (revertTemp func()) {
func (gd *gridDiagram) sizeForOutsideLabels() (revert func()) {
margins := make(map[*d2graph.Object]geo.Spacing)
for _, o := range gd.objects {
margin := o.GetMargin()
if margin.Top > 0 {
o.Height += margin.Top
}
if margin.Bottom > 0 {
o.Height += margin.Bottom
}
if margin.Left > 0 {
o.Width += margin.Left
}
if margin.Right > 0 {
o.Width += margin.Right
}
margins[o] = margin
o.Height += margin.Top + margin.Bottom
o.Width += margin.Left + margin.Right
}
return func() {