Only capture the canvas size. Nothing more

MagicalTux · Nov 2, 2020 · a5df8f1 · a5df8f1
1 parent e17a371
commit a5df8f1
Show file tree

Hide file tree

Showing 9 changed files with 2 additions and 3 deletions.
diff --git a/internal/painter/software/painter.go b/internal/painter/software/painter.go
@@ -25,8 +25,7 @@ func NewPainter() *Painter {
 func (*Painter) Paint(c fyne.Canvas) image.Image {
 	theme := fyne.CurrentApp().Settings().Theme()
 
-	size := c.Size().Max(c.Content().MinSize())
-	bounds := image.Rect(0, 0, internal.ScaleInt(c, size.Width), internal.ScaleInt(c, size.Height))
+	bounds := image.Rect(0, 0, internal.ScaleInt(c, c.Size().Width), internal.ScaleInt(c, c.Size().Height))
 	base := image.NewNRGBA(bounds)
 	draw.Draw(base, bounds, image.NewUniform(theme.BackgroundColor()), image.Point{}, draw.Src)
 

diff --git a/widget/form_test.go b/widget/form_test.go
@@ -122,7 +122,7 @@ func TestForm_ChangeTheme(t *testing.T) {
 		},
 		OnSubmit: func() {}, OnCancel: func() {}}
 	w := test.NewWindow(form)
-	w.Resize(fyne.NewSize(300, 200))
+	w.Resize(fyne.NewSize(340, 240))
 	defer w.Close()
 
 	test.AssertImageMatches(t, "form/theme_initial.png", w.Canvas().Capture())

diff --git a/widget/testdata/entry/placeholder_initial.png b/widget/testdata/entry/placeholder_initial.png
diff --git a/widget/testdata/entry/wrap_multi_line_off.png b/widget/testdata/entry/wrap_multi_line_off.png
diff --git a/widget/testdata/entry/wrap_single_line_off.png b/widget/testdata/entry/wrap_single_line_off.png
diff --git a/widget/testdata/form/theme_changed.png b/widget/testdata/form/theme_changed.png
diff --git a/widget/testdata/form/theme_initial.png b/widget/testdata/form/theme_initial.png
diff --git a/widget/testdata/list/list_theme_changed.png b/widget/testdata/list/list_theme_changed.png
diff --git a/widget/testdata/tree/theme_changed.png b/widget/testdata/tree/theme_changed.png