Merge branch 'develop' into hyperlink-sizename

app/app_xdg.go

@@ -20,8 +20,10 @@ import (
  "fyne.io/fyne/v2/theme"
 )
 
+var currentVariant atomic.Uint64
+
 func defaultVariant() fyne.ThemeVariant {
- return findFreedestktopColorScheme()
+ return fyne.ThemeVariant(currentVariant.Load())
 }
 
 func (a *fyneApp) OpenURL(url *url.URL) error {
@@ -39,7 +41,7 @@ func (a *fyneApp) OpenURL(url *url.URL) error {
 }
 
 // fetch color variant from dbus portal desktop settings.
-func findFreedestktopColorScheme() fyne.ThemeVariant {
+func findFreedesktopColorScheme() fyne.ThemeVariant {
  colourScheme, err := appearance.GetColorScheme()
  if err != nil {
  return theme.VariantDark
@@ -119,9 +121,15 @@ func rootConfigDir() string {
 }
 
 func watchTheme() {
- go portalSettings.OnSignalSettingChanged(func(changed portalSettings.Changed) {
- if changed.Namespace == "org.freedesktop.appearance" && changed.Key == "color-scheme" {
- fyne.CurrentApp().Settings().(*settings).setupTheme()
- }
- })
+ go func() {
+ // with portal this may not be immediate, so we update a cache instead
+ currentVariant.Store(uint64(findFreedesktopColorScheme()))
+
+ portalSettings.OnSignalSettingChanged(func(changed portalSettings.Changed) {
+ if changed.Namespace == "org.freedesktop.appearance" && changed.Key == "color-scheme" {
+ currentVariant.Store(uint64(findFreedesktopColorScheme()))
+ fyne.CurrentApp().Settings().(*settings).setupTheme()
+ }
+ })
+ }()
 }

app/preferences_test.go

@@ -72,8 +72,7 @@ func TestPreferences_Save_OverwriteFast(t *testing.T) {
  val["key"] = "value"
  })
 
- path := filepath.Join(os.TempDir(), "fynePrefs2.json")
- defer os.Remove(path)
+ path := filepath.Join(t.TempDir(), "fynePrefs2.json")
  p.saveToFile(path)
 
  p.WriteValues(func(val map[string]any) {

canvas/image_test.go

@@ -43,6 +43,7 @@ func TestNewImageFromReader(t *testing.T) {
  path := filepath.Join(filepath.Dir(pwd), "theme", "icons", "fyne.png")
  read, err := os.Open(path)
  assert.Nil(t, err)
+ defer read.Close()
 
  img := canvas.NewImageFromReader(read, "fyne.png")
  assert.NotNil(t, img)

cmd/fyne/internal/commands/get.go

@@ -60,6 +60,13 @@ func NewGetter() *Getter {
 
 // Get automates the download and install of a named GUI app package.
 func (g *Getter) Get(pkg string) error {
+ wd, _ := os.Getwd()
+ defer func() {
+ if wd != "" {
+ os.Chdir(wd)
+ }
+ }()
+
  name := filepath.Base(pkg)
  path, err := os.MkdirTemp("", fmt.Sprintf("fyne-get-%s-*", name))
  if err != nil {

cmd/fyne_demo/tutorials/widget.go

@@ -470,6 +470,10 @@ func startProgress() {
 }
 
 func stopProgress() {
+ if infProgress == nil {
+ return
+ }
+
  if !infProgress.Running() {
  return
  }

dialog/file.go

@@ -867,6 +867,7 @@ func getFavoriteIcons() map[string]fyne.Resource {
  if runtime.GOOS == "darwin" {
  return map[string]fyne.Resource{
  "Documents": theme.DocumentIcon(),
+ "Desktop": theme.DesktopIcon(),
  "Downloads": theme.DownloadIcon(),
  "Music": theme.MediaMusicIcon(),
  "Pictures": theme.MediaPhotoIcon(),
@@ -876,6 +877,7 @@ func getFavoriteIcons() map[string]fyne.Resource {
 
  return map[string]fyne.Resource{
  "Documents": theme.DocumentIcon(),
+ "Desktop": theme.DesktopIcon(),
  "Downloads": theme.DownloadIcon(),
  "Music": theme.MediaMusicIcon(),
  "Pictures": theme.MediaPhotoIcon(),
@@ -885,6 +887,7 @@ func getFavoriteIcons() map[string]fyne.Resource {
 
 func getFavoriteOrder() []string {
  order := []string{
+ "Desktop",
  "Documents",
  "Downloads",
  "Music",

dialog/file_xdg.go

@@ -45,6 +45,7 @@ func getFavoriteLocations() (map[string]fyne.ListableURI, error) {
 
  favoriteNames := getFavoriteOrder()
  arguments := map[string]string{
+ "Desktop": "DESKTOP",
  "Documents": "DOCUMENTS",
  "Downloads": "DOWNLOAD",
  "Music": "MUSIC",

internal/driver/mobile/app/android.go

@@ -522,7 +522,7 @@ func runInputQueue(vm, jniEnv, ctx uintptr) error {
 
  var q *C.AInputQueue
  for {
- if C.ALooper_pollAll(-1, nil, nil, nil) == C.ALOOPER_POLL_WAKE {
+ if C.ALooper_pollOnce(-1, nil, nil, nil) == C.ALOOPER_POLL_WAKE {
  select {
  default:
  case p := <-pending:

internal/repository/file_test.go

@@ -41,16 +41,12 @@ func TestFileRepositoryRegistration(t *testing.T) {
 }
 
 func TestFileRepositoryExists(t *testing.T) {
- dir, err := os.MkdirTemp("", "FyneInternalRepositoryFileTest")
- if err != nil {
- t.Fatal(err)
- }
- defer os.RemoveAll(dir)
+ dir := t.TempDir()
 
  existsPath := path.Join(dir, "exists")
  notExistsPath := path.Join(dir, "notExists")
 
- err = os.WriteFile(existsPath, []byte{1, 2, 3, 4}, 0755)
+ err := os.WriteFile(existsPath, []byte{1, 2, 3, 4}, 0755)
  if err != nil {
  t.Fatal(err)
  }
@@ -65,18 +61,13 @@ func TestFileRepositoryExists(t *testing.T) {
 }
 
 func TestFileRepositoryReader(t *testing.T) {
- // Set up a temporary directory.
- dir, err := os.MkdirTemp("", "FyneInternalRepositoryFileTest")
- if err != nil {
- t.Fatal(err)
- }
- defer os.RemoveAll(dir)
+ dir := t.TempDir()
 
  // Create some files to test with.
  fooPath := path.Join(dir, "foo")
  barPath := path.Join(dir, "bar")
  bazPath := path.Join(dir, "baz")
- err = os.WriteFile(fooPath, []byte{}, 0755)
+ err := os.WriteFile(fooPath, []byte{}, 0755)
  if err != nil {
  t.Fatal(err)
  }
@@ -100,17 +91,20 @@ func TestFileRepositoryReader(t *testing.T) {
  fooData, err := io.ReadAll(fooReader)
  assert.Equal(t, []byte{}, fooData)
  assert.Nil(t, err)
+ fooReader.Close()
 
  // Make sure we can read the file with data.
  barReader, err := storage.Reader(bar)
  assert.Nil(t, err)
  barData, err := io.ReadAll(barReader)
  assert.Equal(t, []byte{1, 2, 3}, barData)
  assert.Nil(t, err)
+ barReader.Close()
 
  // Make sure we get an error if the file doesn't exist.
- _, err = storage.Reader(baz)
+ bazReader, err := storage.Reader(baz)
  assert.NotNil(t, err)
+ bazReader.Close()
 
  // Also test that CanRead returns the expected results.
  fooCanRead, err := storage.CanRead(foo)
@@ -127,19 +121,14 @@ func TestFileRepositoryReader(t *testing.T) {
 }
 
 func TestFileRepositoryWriter(t *testing.T) {
- // Set up a temporary directory.
- dir, err := os.MkdirTemp("", "FyneInternalRepositoryFileTest")
- if err != nil {
- t.Fatal(err)
- }
- defer os.RemoveAll(dir)
+ dir := t.TempDir()
 
  // Create some files to test with.
  fooPath := path.Join(dir, "foo")
  barPath := path.Join(dir, "bar")
  bazPath := path.Join(dir, "baz")
  spamHamPath := path.Join(dir, "spam", "ham")
- err = os.WriteFile(fooPath, []byte{}, 0755)
+ err := os.WriteFile(fooPath, []byte{}, 0755)
  if err != nil {
  t.Fatal(err)
  }
@@ -247,18 +236,13 @@ func TestFileRepositoryWriter(t *testing.T) {
 }
 
 func TestFileRepositoryCanWrite(t *testing.T) {
- // Set up a temporary directory.
- dir, err := os.MkdirTemp("", "FyneInternalRepositoryFileTest")
- if err != nil {
- t.Fatal(err)
- }
- defer os.RemoveAll(dir)
+ dir := t.TempDir()
 
  // Create some files to test with.
  fooPath := path.Join(dir, "foo")
  barPath := path.Join(dir, "bar")
  bazPath := path.Join(dir, "baz")
- err = os.WriteFile(fooPath, []byte{}, 0755)
+ err := os.WriteFile(fooPath, []byte{}, 0755)
  if err != nil {
  t.Fatal(err)
  }
@@ -365,17 +349,12 @@ func TestFileRepositoryChild(t *testing.T) {
 }
 
 func TestFileRepositoryCopy(t *testing.T) {
- // Set up a temporary directory.
- dir, err := os.MkdirTemp("", "FyneInternalRepositoryFileTest")
- if err != nil {
- t.Fatal(err)
- }
- defer os.RemoveAll(dir)
+ dir := t.TempDir()
 
  // Create some files to test with.
  fooPath := path.Join(dir, "foo")
  barPath := path.Join(dir, "bar")
- err = os.WriteFile(fooPath, []byte{1, 2, 3, 4, 5}, 0755)
+ err := os.WriteFile(fooPath, []byte{1, 2, 3, 4, 5}, 0755)
  if err != nil {
  t.Fatal(err)
  }
@@ -396,17 +375,12 @@ func TestFileRepositoryCopy(t *testing.T) {
 }
 
 func TestFileRepositoryMove(t *testing.T) {
- // Set up a temporary directory.
- dir, err := os.MkdirTemp("", "FyneInternalRepositoryFileTest")
- if err != nil {
- t.Fatal(err)
- }
- defer os.RemoveAll(dir)
+ dir := t.TempDir()
 
  // Create some files to test with.
  fooPath := path.Join(dir, "foo")
  barPath := path.Join(dir, "bar")
- err = os.WriteFile(fooPath, []byte{1, 2, 3, 4, 5}, 0755)
+ err := os.WriteFile(fooPath, []byte{1, 2, 3, 4, 5}, 0755)
  if err != nil {
  t.Fatal(err)
  }
@@ -429,12 +403,7 @@ func TestFileRepositoryMove(t *testing.T) {
 }
 
 func TestFileRepositoryListing(t *testing.T) {
- // Set up a temporary directory.
- dir, err := os.MkdirTemp("", "FyneInternalRepositoryFileTest")
- if err != nil {
- t.Fatal(err)
- }
- defer os.RemoveAll(dir)
+ dir := t.TempDir()
 
  // Create some files to tests with.
  fooPath := path.Join(dir, "foo")
@@ -466,12 +435,7 @@ func TestFileRepositoryListing(t *testing.T) {
 }
 
 func TestFileRepositoryCreateListable(t *testing.T) {
- // Set up a temporary directory.
- dir, err := os.MkdirTemp("", "FyneInternalRepositoryFileTest")
- if err != nil {
- t.Fatal(err)
- }
- defer os.RemoveAll(dir)
+ dir := t.TempDir()
 
  f := NewFileRepository()
  repository.Register("file", f)
@@ -482,7 +446,7 @@ func TestFileRepositoryCreateListable(t *testing.T) {
  fooBar := storage.NewFileURI(fooBarPath)
 
  // Creating a dir with no parent should fail
- err = storage.CreateListable(fooBar)
+ err := storage.CreateListable(fooBar)
  assert.NotNil(t, err)
 
  // Creating foo should work though