zeni/go-chart
1
0
Fork 0
Code Issues Pull requests Projects Releases 2 Packages Wiki Activity Actions

fix: use padding in legend from passed style

Browse source 
Prior to this commit we simply defined a hardcoded padding. This commit respects the passed style and inherits from a default padding defined in legendDefaults.
This commit is contained in:
Rico 2022-02-08 03:10:53 +01:00
parent 5407f1fdb4
commit f0b283349e
No known key found for this signature in database
GPG key ID: 91F477359C5B7AD3
1 changed files with 13 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
legend.go
View file

@ -127,6 +127,12 @@ func LegendLineLeft(c *Chart, userDefaults ...Style) Renderable {
FontSize: 8.0, FontSize: 8.0,
StrokeColor: DefaultAxisColor, StrokeColor: DefaultAxisColor,
StrokeWidth: DefaultAxisLineWidth, StrokeWidth: DefaultAxisLineWidth,
Padding: Box{
Top: 5,
Left: 5,
Right: 5,
Bottom: 5,
},
} }
var legendStyle Style var legendStyle Style
@ -137,12 +143,6 @@ func LegendLineLeft(c *Chart, userDefaults ...Style) Renderable {
} }
// DEFAULTS // DEFAULTS
legendPadding := Box{
Top: 5,
Left: 5,
Right: 5,
Bottom: 5,
}
lineTextGap := 5 lineTextGap := 5
lineLengthMinimum := 25 lineLengthMinimum := 25
@ -164,10 +164,10 @@ func LegendLineLeft(c *Chart, userDefaults ...Style) Renderable {
} }
legendContent := Box{ legendContent := Box{
Top: legend.Top + legendPadding.Top, Top: legend.Top + legendStyle.Padding.Top,
Left: legend.Left + legendPadding.Left, Left: legend.Left + legendStyle.Padding.Left,
Right: legend.Left + legendPadding.Left, Right: legend.Left + legendStyle.Padding.Left,
Bottom: legend.Top + legendPadding.Top, Bottom: legend.Top + legendStyle.Padding.Top,
} }
legendStyle.GetTextOptions().WriteToRenderer(r) legendStyle.GetTextOptions().WriteToRenderer(r)
@ -188,8 +188,8 @@ func LegendLineLeft(c *Chart, userDefaults ...Style) Renderable {
} }
legend = legend.Grow(legendContent) legend = legend.Grow(legendContent)
legend.Right = legendContent.Right + legendPadding.Right legend.Right = legendContent.Right + legendStyle.Padding.Right
legend.Bottom = legendContent.Bottom + legendPadding.Bottom legend.Bottom = legendContent.Bottom + legendStyle.Padding.Bottom
Draw.Box(r, legend, legendStyle) Draw.Box(r, legend, legendStyle)
@ -215,7 +215,7 @@ func LegendLineLeft(c *Chart, userDefaults ...Style) Renderable {
ly := ty - th2 ly := ty - th2
// Calculate line ending x coordinate // Calculate line ending x coordinate
lx2 := lx + lineLengthMinimum lx2 := lx + lineLengthMinimum - legendStyle.Padding.Left
r.SetStrokeColor(lines[x].GetStrokeColor()) r.SetStrokeColor(lines[x].GetStrokeColor())
r.SetStrokeWidth(lines[x].GetStrokeWidth()) r.SetStrokeWidth(lines[x].GetStrokeWidth())