Merge branch 'fyne-io:develop' into develop

Author: nh3000-org

CHANGELOG.md

@@ -9,6 +9,7 @@ More detailed release notes can be found on the [releases page](https://github.c
 
 * Go 1.17 or later is now required.
 * Icons for macOS bundles are now padded and rounded, disable with "-use-raw-icon"
+* Focus handling for List/Tree/Table are now at the parent widget not child elements
 
 
 ## 2.3.5 - 6 June 2023

app/app.go

@@ -14,8 +14,6 @@ import (
 	"fyne.io/fyne/v2/internal/app"
 	intRepo "fyne.io/fyne/v2/internal/repository"
 	"fyne.io/fyne/v2/storage/repository"
-
-	"golang.org/x/sys/execabs"
 )
 
 // Declare conformity with App interface
@@ -33,7 +31,6 @@ type fyneApp struct {
 	prefs     fyne.Preferences
 
 	running uint32 // atomic, 1 == running, 0 == stopped
-	exec    func(name string, arg ...string) *execabs.Cmd
 }
 
 func (a *fyneApp) CloudProvider() fyne.CloudProvider {
@@ -72,7 +69,6 @@ func (a *fyneApp) NewWindow(title string) fyne.Window {
 func (a *fyneApp) Run() {
 	if atomic.CompareAndSwapUint32(&a.running, 0, 1) {
 		a.driver.Run()
-		return
 	}
 }
 
@@ -110,10 +106,10 @@ func (a *fyneApp) Lifecycle() fyne.Lifecycle {
 	return a.lifecycle
 }
 
-func (a *fyneApp) newDefaultPreferences() fyne.Preferences {
-	p := fyne.Preferences(newPreferences(a))
-	if pref, ok := p.(interface{ load() }); ok && a.uniqueID != "" {
-		pref.load()
+func (a *fyneApp) newDefaultPreferences() *preferences {
+	p := newPreferences(a)
+	if a.uniqueID != "" {
+		p.load()
 	}
 	return p
 }
@@ -126,11 +122,8 @@ func New() fyne.App {
 	return NewWithID(meta.ID)
 }
 
-func makeStoreDocs(id string, p fyne.Preferences, s *store) *internal.Docs {
+func makeStoreDocs(id string, s *store) *internal.Docs {
 	if id != "" {
-		if pref, ok := p.(interface{ load() }); ok {
-			pref.load()
-		}
 		err := os.MkdirAll(s.a.storageRoot(), 0755) // make the space before anyone can use it
 		if err != nil {
 			fyne.LogError("Failed to create app storage space", err)
@@ -144,21 +137,27 @@ func makeStoreDocs(id string, p fyne.Preferences, s *store) *internal.Docs {
 }
 
 func newAppWithDriver(d fyne.Driver, id string) fyne.App {
-	newApp := &fyneApp{uniqueID: id, driver: d, exec: execabs.Command, lifecycle: &app.Lifecycle{}}
+	newApp := &fyneApp{uniqueID: id, driver: d, lifecycle: &app.Lifecycle{}}
 	fyne.SetCurrentApp(newApp)
 
 	newApp.prefs = newApp.newDefaultPreferences()
+	newApp.lifecycle.(*app.Lifecycle).SetOnStoppedHookExecuted(func() {
+		if prefs, ok := newApp.prefs.(*preferences); ok {
+			prefs.forceImmediateSave()
+		}
+	})
 	newApp.settings = loadSettings()
 	store := &store{a: newApp}
-	store.Docs = makeStoreDocs(id, newApp.prefs, store)
+	store.Docs = makeStoreDocs(id, store)
 	newApp.storage = store
 
 	if !d.Device().IsMobile() {
 		newApp.settings.watchSettings()
 	}
 
-	repository.Register("http", intRepo.NewHTTPRepository())
-	repository.Register("https", intRepo.NewHTTPRepository())
+	httpHandler := intRepo.NewHTTPRepository()
+	repository.Register("http", httpHandler)
+	repository.Register("https", httpHandler)
 
 	return newApp
 }

app/app_desktop_darwin.go

@@ -19,6 +19,8 @@ import (
 	"os"
 	"path/filepath"
 
+	"golang.org/x/sys/execabs"
+
 	"fyne.io/fyne/v2"
 	"fyne.io/fyne/v2/theme"
 )
@@ -52,7 +54,7 @@ func rootConfigDir() string {
 }
 
 func (a *fyneApp) OpenURL(url *url.URL) error {
-	cmd := a.exec("open", url.String())
+	cmd := execabs.Command("open", url.String())
 	cmd.Stdin, cmd.Stdout, cmd.Stderr = os.Stdin, os.Stdout, os.Stderr
 	return cmd.Run()
 }

app/app_test.go

@@ -1,16 +1,12 @@
 package app
 
 import (
-	"net/url"
-	"strings"
 	"testing"
 
 	"github.com/stretchr/testify/assert"
 
 	"fyne.io/fyne/v2"
 	_ "fyne.io/fyne/v2/test"
-
-	"golang.org/x/sys/execabs"
 )
 
 func TestDummyApp(t *testing.T) {
@@ -37,21 +33,18 @@ func TestFyneApp_UniqueID(t *testing.T) {
 	assert.Equal(t, meta.ID, app.UniqueID())
 }
 
-func TestFyneApp_OpenURL(t *testing.T) {
-	opened := ""
+func TestFyneApp_SetIcon(t *testing.T) {
 	app := NewWithID("io.fyne.test")
-	app.(*fyneApp).exec = func(cmd string, arg ...string) *execabs.Cmd {
-		opened = arg[len(arg)-1]
-		return execabs.Command("")
-	}
 
-	urlStr := "https://fyne.io"
-	u, _ := url.Parse(urlStr)
-	err := app.OpenURL(u)
+	metaIcon := &fyne.StaticResource{StaticName: "Metadata"}
+	SetMetadata(fyne.AppMetadata{
+		Icon: metaIcon,
+	})
+
+	assert.Equal(t, metaIcon, app.Icon())
 
-	if err != nil && strings.Contains(err.Error(), "unknown operating system") {
-		return // when running in CI mode we don't actually open URLs...
-	}
+	setIcon := &fyne.StaticResource{StaticName: "Test"}
+	app.SetIcon(setIcon)
 
-	assert.Equal(t, urlStr, opened)
+	assert.Equal(t, setIcon, app.Icon())
 }

app/app_windows.go

@@ -11,12 +11,11 @@ import (
 	"strings"
 	"syscall"
 
+	"golang.org/x/sys/execabs"
 	"golang.org/x/sys/windows/registry"
 
 	"fyne.io/fyne/v2"
 	"fyne.io/fyne/v2/theme"
-
-	"golang.org/x/sys/execabs"
 )
 
 const notificationTemplate = `$title = "%s"
@@ -63,7 +62,7 @@ func rootConfigDir() string {
 }
 
 func (a *fyneApp) OpenURL(url *url.URL) error {
-	cmd := a.exec("rundll32", "url.dll,FileProtocolHandler", url.String())
+	cmd := execabs.Command("rundll32", "url.dll,FileProtocolHandler", url.String())
 	cmd.Stdin, cmd.Stdout, cmd.Stderr = os.Stdin, os.Stdout, os.Stderr
 	return cmd.Run()
 }

app/app_xdg.go

@@ -15,6 +15,7 @@ import (
 	"sync"
 
 	"github.com/godbus/dbus/v5"
+	"golang.org/x/sys/execabs"
 
 	"fyne.io/fyne/v2"
 	"fyne.io/fyne/v2/theme"
@@ -27,7 +28,7 @@ func defaultVariant() fyne.ThemeVariant {
 }
 
 func (a *fyneApp) OpenURL(url *url.URL) error {
-	cmd := a.exec("xdg-open", url.String())
+	cmd := execabs.Command("xdg-open", url.String())
 	cmd.Stdin, cmd.Stdout, cmd.Stderr = os.Stdin, os.Stdout, os.Stderr
 	return cmd.Start()
 }

app/cloud.go

@@ -33,7 +33,7 @@ func (a *fyneApp) transitionCloud(p fyne.CloudProvider) {
 		a.storage = cloud.CloudStorage(a)
 	} else {
 		store := &store{a: a}
-		store.Docs = makeStoreDocs(a.uniqueID, a.prefs, store)
+		store.Docs = makeStoreDocs(a.uniqueID, store)
 		a.storage = store
 	}
 

app/preferences.go

@@ -19,12 +19,25 @@ type preferences struct {
 	savedRecently       bool
 	changedDuringSaving bool
 
-	app *fyneApp
+	app                 *fyneApp
+	needsSaveBeforeExit bool
 }
 
 // Declare conformity with Preferences interface
 var _ fyne.Preferences = (*preferences)(nil)
 
+// forceImmediateSave writes preferences to file immediately, ignoring the debouncing
+// logic in the change listener. Does nothing if preferences are not backed with a file.
+func (p *preferences) forceImmediateSave() {
+	if !p.needsSaveBeforeExit {
+		return
+	}
+	err := p.save()
+	if err != nil {
+		fyne.LogError("Failed on force saving preferences", err)
+	}
+}
+
 func (p *preferences) resetSavedRecently() {
 	go func() {
 		time.Sleep(time.Millisecond * 100) // writes are not always atomic. 10ms worked, 100 is safer.
@@ -132,6 +145,7 @@ func newPreferences(app *fyneApp) *preferences {
 		return p
 	}
 
+	p.needsSaveBeforeExit = true
 	p.AddChangeListener(func() {
 		if p != app.prefs {
 			return

app/settings_desktop_test.go

@@ -6,22 +6,14 @@ package app
 import (
 	"os"
 	"path/filepath"
-	"runtime"
 	"testing"
 	"time"
 
 	"github.com/stretchr/testify/assert"
 
 	"fyne.io/fyne/v2"
-	"fyne.io/fyne/v2/theme"
 )
 
-func TestDefaultTheme(t *testing.T) {
-	if runtime.GOOS != "darwin" && runtime.GOOS != "windows" { // system defines default for macOS and Windows
-		assert.Equal(t, theme.VariantDark, defaultVariant())
-	}
-}
-
 func TestEnsureDir(t *testing.T) {
 	tmpDir := testPath("fynetest")
 

app/storage_test.go

@@ -4,14 +4,12 @@ import (
 	"testing"
 
 	"github.com/stretchr/testify/assert"
-
-	"fyne.io/fyne/v2/internal"
 )
 
 func TestStore_RootURI(t *testing.T) {
 	id := "io.fyne.test"
 	a := &fyneApp{uniqueID: id}
-	d := makeStoreDocs(id, &internal.InMemoryPreferences{}, &store{a: a})
+	d := makeStoreDocs(id, &store{a: a})
 
 	w, err := d.Create("test")
 	assert.Nil(t, err)

canvas/image.go

@@ -175,12 +175,18 @@ func (i *Image) Resize(s fyne.Size) {
 	if s == i.Size() {
 		return
 	}
-	if i.FillMode == ImageFillOriginal && i.size.Height > 2 { // don't refresh original scale images after first draw
+	i.baseObject.Resize(s)
+	if i.FillMode == ImageFillOriginal && i.size.Height > 2 { // we can just ask for a GPU redraw to align
+		Refresh(i)
 		return
 	}
 
 	i.baseObject.Resize(s)
-	i.Refresh()
+	if i.isSVG || i.Image == nil {
+		i.Refresh() // we need to rasterise at the new size
+	} else {
+		Refresh(i) // just re-size using GPU scaling
+	}
 }
 
 // NewImageFromFile creates a new image from a local file.

cmd/fyne/internal/commands/build.go

@@ -9,7 +9,7 @@ import (
 	"runtime"
 	"strings"
 
-	version "github.com/mcuadros/go-version"
+	"github.com/mcuadros/go-version"
 	"github.com/urfave/cli/v2"
 
 	"fyne.io/fyne/v2"
@@ -414,14 +414,14 @@ func injectMetadataIfPossible(runner runner, srcdir string, app *appData,
 		return nil, err
 	}
 
-	fyneGoModVersionNormalized := version.Normalize(fyneGoModVersion)
+	fyneGoModVersion = normaliseVersion(fyneGoModVersion)
 	fyneGoModVersionConstraint := version.NewConstrainGroupFromString(">=2.2")
-	if fyneGoModVersion != "master" && !fyneGoModVersionConstraint.Match(fyneGoModVersionNormalized) {
+	if fyneGoModVersion != "master" && !fyneGoModVersionConstraint.Match(fyneGoModVersion) {
 		return nil, nil
 	}
 
 	fyneGoModVersionAtLeast2_3 := version.NewConstrainGroupFromString(">=2.3")
-	if fyneGoModVersionAtLeast2_3.Match(fyneGoModVersionNormalized) {
+	if fyneGoModVersionAtLeast2_3.Match(fyneGoModVersion) {
 		app.VersionAtLeast2_3 = true
 	}
 
@@ -485,3 +485,14 @@ func extractLdFlags(goFlags string) (string, string) {
 
 	return ldflags, newGoFlags
 }
+
+func normaliseVersion(str string) string {
+	if str == "master" {
+		return str
+	}
+
+	if pos := strings.Index(str, "-0.20"); pos != -1 {
+		str = str[:pos] + "-dev"
+	}
+	return version.Normalize(str)
+}

cmd/fyne/internal/commands/build_test.go

@@ -334,3 +334,10 @@ func Test_ExtractLdFlags(t *testing.T) {
 		assert.Equal(t, test.wantGoFlags, goFlags)
 	}
 }
+
+func Test_NormaliseVersion(t *testing.T) {
+	assert.Equal(t, "master", normaliseVersion("master"))
+	assert.Equal(t, "2.3.0.0", normaliseVersion("v2.3"))
+	assert.Equal(t, "2.4.0.0", normaliseVersion("v2.4.0"))
+	assert.Equal(t, "2.3.6.0-dev", normaliseVersion("v2.3.6-0.20230711180435-d4b95e1cb1eb"))
+}

cmd/fyne/internal/commands/package-unix.go

@@ -7,6 +7,7 @@ import (
 	"path/filepath"
 	"strings"
 
+	"fyne.io/fyne/v2/cmd/fyne/internal/metadata"
 	"fyne.io/fyne/v2/cmd/fyne/internal/templates"
 
 	"golang.org/x/sys/execabs"
@@ -58,16 +59,20 @@ func (p *Packager) packageUNIX() error {
 	desktop := filepath.Join(appsDir, p.Name+".desktop")
 	deskFile, _ := os.Create(desktop)
 
+	linuxBSD := metadata.LinuxAndBSD{}
+	if p.linuxAndBSDMetadata != nil {
+		linuxBSD = *p.linuxAndBSDMetadata
+	}
 	tplData := unixData{
 		Name:        p.Name,
 		Exec:        filepath.Base(p.exe),
 		Icon:        p.Name + filepath.Ext(p.icon),
 		Local:       local,
-		GenericName: p.linuxAndBSDMetadata.GenericName,
-		Keywords:    formatDesktopFileList(p.linuxAndBSDMetadata.Keywords),
-		Comment:     p.linuxAndBSDMetadata.Comment,
-		Categories:  formatDesktopFileList(p.linuxAndBSDMetadata.Categories),
-		ExecParams:  p.linuxAndBSDMetadata.ExecParams,
+		GenericName: linuxBSD.GenericName,
+		Keywords:    formatDesktopFileList(linuxBSD.Keywords),
+		Comment:     linuxBSD.Comment,
+		Categories:  formatDesktopFileList(linuxBSD.Categories),
+		ExecParams:  linuxBSD.ExecParams,
 	}
 	err = templates.DesktopFileUNIX.Execute(deskFile, tplData)
 	if err != nil {