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

update sizing adjustments pre/post grid layout

Browse source
This commit is contained in:
Gavin Nishizawa 2023-10-16 17:33:44 -07:00
parent 04a64e46c3
commit bd6c1d1af1
No known key found for this signature in database
GPG key ID: AE3B177777CE55CD
1 changed files with 24 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
d2layouts/d2grid/layout.go
View file

@ -853,11 +853,19 @@ func getDistToTarget(layout [][]*d2graph.Object, targetSize float64, horizontalG
}
func (gd *gridDiagram) sizeForOutsideLabels() (revert func()) {
margins := make(map[*d2graph.Object]geo.Spacing)
type sizing struct {
width, height float64
margin geo.Spacing
}
sizings := make(map[*d2graph.Object]sizing)
for _, o := range gd.objects {
margin := o.GetMargin()
margins[o] = margin
sizings[o] = sizing{
width: o.Width,
height: o.Height,
margin: margin,
}
o.Height += margin.Top + margin.Bottom
o.Width += margin.Left + margin.Right
@ -865,13 +873,24 @@ func (gd *gridDiagram) sizeForOutsideLabels() (revert func()) {
return func() {
for _, o := range gd.objects {
margin, has := margins[o]
sizing, has := sizings[o]
if !has {
continue
}
dy := sizing.margin.Top + sizing.margin.Bottom
dx := sizing.margin.Left + sizing.margin.Right
o.Height -= dy
o.Width -= dx
o.Height -= margin.Top + margin.Bottom
o.Width -= margin.Left + margin.Right
// layout may have resized the object changing the margins necessary
margin := o.GetMargin()
if margin.Top+margin.Bottom < dy {
// layout grew height and now we need less of a margin
o.Height += dy - (margin.Top + margin.Bottom)
}
if margin.Left+margin.Right < dx {
o.Width += dx - (margin.Left + margin.Right)
}
if margin.Left > 0 || margin.Top > 0 {
o.MoveWithDescendants(margin.Left, margin.Top)