Bugs/default canvas scale

canvas/image.go

@@ -316,19 +316,10 @@ func (img *Image) minSizeFromReader(source io.Reader) (fyne.Size, error) {
 		img.aspect = float32(width) / float32(height)
 	}
 
-	app := fyne.CurrentApp()
-	if app == nil {
-		return fyne.NewSize(0, 0), errors.New("no current app")
-	}
-	driver := app.Driver()
-	if driver == nil {
-		return fyne.NewSize(0, 0), errors.New("no current driver")
-	}
-	c := driver.CanvasForObject(img)
-	if c == nil {
-		return fyne.NewSize(0, 0), errors.New("object is not attached to a canvas yet")
+	dpSize, err := scale.AdaptToFyneCoordinate(img, width, height)
+	if err != nil {
+		dpSize = fyne.NewSize(float32(width), float32(height))
 	}
-	dpSize := fyne.NewSize(scale.ToFyneCoordinate(c, width), scale.ToFyneCoordinate(c, height))
 
 	return dpSize, nil
 }

driver/software/render_test.go

@@ -1,9 +1,11 @@
 package software
 
 import (
+	"image/color"
 	"testing"
 
 	"fyne.io/fyne/v2"
+	"fyne.io/fyne/v2/canvas"
 	"fyne.io/fyne/v2/container"
 	"fyne.io/fyne/v2/test"
 	"fyne.io/fyne/v2/theme"
@@ -49,3 +51,15 @@ func TestRenderCanvas(t *testing.T) {
 		test.AssertImageMatches(t, "canvas.png", RenderCanvas(c, theme.LightTheme()))
 	}
 }
+
+func TestRender_ImageSize(t *testing.T) {
+	image := canvas.NewImageFromFile("../../theme/icons/fyne.png")
+	image.FillMode = canvas.ImageFillOriginal
+	bg := canvas.NewCircle(color.NRGBA{255, 0, 0, 128})
+	bg.StrokeColor = color.White
+	bg.StrokeWidth = 5
+
+	c := container.NewMax(image, bg)
+
+	test.AssertImageMatches(t, "image_size.png", Render(c, theme.LightTheme()))
+}

internal/scale/scale.go

@@ -1,6 +1,7 @@
 package scale
 
 import (
+	"errors"
 	"math"
 
 	"fyne.io/fyne/v2"
@@ -22,3 +23,21 @@ func ToFyneCoordinate(c fyne.Canvas, v int) float32 {
 		return float32(v) / c.Scale()
 	}
 }
+
+func AdaptToFyneCoordinate(obj fyne.CanvasObject, width, height int) (fyne.Size, error) {
+	app := fyne.CurrentApp()
+	if app == nil {
+		return fyne.NewSize(0, 0), errors.New("no current app")
+	}
+	driver := app.Driver()
+	if driver == nil {
+		return fyne.NewSize(0, 0), errors.New("no current driver")
+	}
+	c := driver.CanvasForObject(obj)
+	if c == nil {
+		return fyne.NewSize(0, 0), errors.New("object is not attached to a canvas yet")
+	}
+	dpSize := fyne.NewSize(ToFyneCoordinate(c, width), ToFyneCoordinate(c, height))
+
+	return dpSize, nil
+}