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-12-12 16:14:09 -08:00
parent 9f63c305a9
commit 55d43f4800
No known key found for this signature in database
GPG key ID: AE3B177777CE55CD
1 changed files with 7 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
d2layouts/d2elklayout/layout.go
View file

@ -257,11 +257,9 @@ func Layout(ctx context.Context, g *d2graph.Graph, opts *ConfigurableOpts) (err
} }
} }
if obj.HasLabel() && obj.HasIcon() && obj.IconPosition != nil { if obj.HasLabel() && obj.HasIcon() {
if !label.FromString(*obj.IconPosition).IsOutside() { // this gives shapes extra height for their label if they also have an icon
// this gives shapes extra height for their label if they also have an icon obj.Height += float64(obj.LabelDimensions.Height + label.PADDING)
obj.Height += float64(obj.LabelDimensions.Height + label.PADDING)
}
} }
margin, _ := obj.SpacingOpt(2*label.PADDING, 0, false) margin, _ := obj.SpacingOpt(2*label.PADDING, 0, false)
@ -570,7 +568,7 @@ func Layout(ctx context.Context, g *d2graph.Graph, opts *ConfigurableOpts) (err
} }
} }
obj.TopLeft.X += margin.Left obj.TopLeft.X += margin.Left
obj.ShiftDescendants(margin.Left, 0) obj.ShiftDescendants(margin.Left/2, 0)
obj.Width -= margin.Left obj.Width -= margin.Left
} }
if margin.Right > 0 { if margin.Right > 0 {
@ -583,8 +581,7 @@ func Layout(ctx context.Context, g *d2graph.Graph, opts *ConfigurableOpts) (err
e.Route[l-1].X -= margin.Right e.Route[l-1].X -= margin.Right
} }
} }
// TODO is this right? obj.ShiftDescendants(-margin.Right/2, 0)
obj.ShiftDescendants(-margin.Right, 0)
obj.Width -= margin.Right obj.Width -= margin.Right
} }
if margin.Top > 0 { if margin.Top > 0 {
@ -598,7 +595,7 @@ func Layout(ctx context.Context, g *d2graph.Graph, opts *ConfigurableOpts) (err
} }
} }
obj.TopLeft.Y += margin.Top obj.TopLeft.Y += margin.Top
obj.ShiftDescendants(0, margin.Top) obj.ShiftDescendants(0, margin.Top/2)
obj.Height -= margin.Top obj.Height -= margin.Top
} }
if margin.Bottom > 0 { if margin.Bottom > 0 {
@ -611,7 +608,7 @@ func Layout(ctx context.Context, g *d2graph.Graph, opts *ConfigurableOpts) (err
e.Route[l-1].Y -= margin.Bottom e.Route[l-1].Y -= margin.Bottom
} }
} }
obj.ShiftDescendants(0, -margin.Bottom) obj.ShiftDescendants(0, -margin.Bottom/2)
obj.Height -= margin.Bottom obj.Height -= margin.Bottom
} }
} }