Fixing background drawing for stacked bar charts

wcharczuk · Jan 10, 2024 · b282c24 · b282c24
1 parent c9c9042
commit b282c24
Show file tree

Hide file tree

Showing 6 changed files with 21 additions and 7 deletions.
diff --git a/examples/horizontal_stacked_bar/main.go b/examples/horizontal_stacked_bar/main.go
@@ -8,9 +8,6 @@ import (
 )
 
 func main() {
-	chart.DefaultBackgroundColor = chart.ColorTransparent
-	chart.DefaultCanvasColor = chart.ColorTransparent
-
 	barWidth := 80
 
 	var (

diff --git a/examples/horizontal_stacked_bar/output.png b/examples/horizontal_stacked_bar/output.png
diff --git a/examples/stacked_bar/output.png b/examples/stacked_bar/output.png
diff --git a/examples/stacked_bar_labels/main.go b/examples/stacked_bar_labels/main.go
@@ -8,9 +8,6 @@ import (
 )
 
 func main() {
-	chart.DefaultBackgroundColor = chart.ColorTransparent
-	chart.DefaultCanvasColor = chart.ColorTransparent
-
 	barWidth := 120
 
 	var (

diff --git a/examples/stacked_bar_labels/output.png b/examples/stacked_bar_labels/output.png
diff --git a/stacked_bar_chart.go b/stacked_bar_chart.go
@@ -115,6 +115,8 @@ func (sbc StackedBarChart) Render(rp RendererProvider, w io.Writer) error {
 	}
 	r.SetDPI(sbc.GetDPI(DefaultDPI))
 
+	sbc.drawBackground(r)
+
 	var canvasBox Box
 	if sbc.IsHorizontal {
 		canvasBox = sbc.getHorizontalAdjustedCanvasBox(r, sbc.getDefaultCanvasBox())
@@ -150,6 +152,25 @@ func (sbc StackedBarChart) drawBars(r Renderer, canvasBox Box) {
 	}
 }
 
+func (sbc StackedBarChart) drawBackground(r Renderer) {
+	Draw.Box(r, Box{
+		Right:  sbc.GetWidth(),
+		Bottom: sbc.GetHeight(),
+	}, sbc.getBackgroundStyle())
+}
+
+func (sbc StackedBarChart) getBackgroundStyle() Style {
+	return sbc.Background.InheritFrom(sbc.styleDefaultsBackground())
+}
+
+func (sbc StackedBarChart) styleDefaultsBackground() Style {
+	return Style{
+		FillColor:   sbc.GetColorPalette().BackgroundColor(),
+		StrokeColor: sbc.GetColorPalette().BackgroundStrokeColor(),
+		StrokeWidth: DefaultStrokeWidth,
+	}
+}
+
 func (sbc StackedBarChart) drawHorizontalBars(r Renderer, canvasBox Box) {
 	yOffset := canvasBox.Top
 	for _, bar := range sbc.Bars {
@@ -471,7 +492,6 @@ func (sbc StackedBarChart) getAdjustedCanvasBox(r Renderer, canvasBox Box) Box {
 		Right:  canvasBox.Left + totalWidth,
 		Bottom: canvasBox.Bottom,
 	}
-
 }
 
 func (sbc StackedBarChart) getHorizontalAdjustedCanvasBox(r Renderer, canvasBox Box) Box {