Cleanup of unneeded locks in canvas objects

canvas/base.go

@@ -8,77 +8,62 @@
 package canvas // import "fyne.io/fyne/v2/canvas"
 
 import (
-	"sync"
-
 	"fyne.io/fyne/v2"
-	"fyne.io/fyne/v2/internal/async"
 )
 
 type baseObject struct {
-	size     async.Size     // The current size of the canvas object
-	position async.Position // The current position of the object
-	Hidden   bool           // Is this object currently hidden
-
-	min async.Size // The minimum size this object can be
+	size     fyne.Size     // The current size of the canvas object
+	position fyne.Position // The current position of the object
+	Hidden   bool          // Is this object currently hidden
 
-	propertyLock sync.RWMutex
+	min fyne.Size // The minimum size this object can be
 }
 
 // Hide will set this object to not be visible.
 func (o *baseObject) Hide() {
-	o.propertyLock.Lock()
-	defer o.propertyLock.Unlock()
-
 	o.Hidden = true
 }
 
 // MinSize returns the specified minimum size, if set, or {1, 1} otherwise.
 func (o *baseObject) MinSize() fyne.Size {
-	min := o.min.Load()
-	if min.IsZero() {
+	if o.min.IsZero() {
 		return fyne.Size{Width: 1, Height: 1}
 	}
 
-	return min
+	return o.min
 }
 
 // Move the object to a new position, relative to its parent.
 func (o *baseObject) Move(pos fyne.Position) {
-	o.position.Store(pos)
+	o.position = pos
 }
 
 // Position gets the current position of this canvas object, relative to its parent.
 func (o *baseObject) Position() fyne.Position {
-	return o.position.Load()
+	return o.position
 }
 
 // Resize sets a new size for the canvas object.
 func (o *baseObject) Resize(size fyne.Size) {
-	o.size.Store(size)
+	o.size = size
 }
 
 // SetMinSize specifies the smallest size this object should be.
 func (o *baseObject) SetMinSize(size fyne.Size) {
-	o.min.Store(size)
+	o.min = size
 }
 
 // Show will set this object to be visible.
 func (o *baseObject) Show() {
-	o.propertyLock.Lock()
-	defer o.propertyLock.Unlock()
-
 	o.Hidden = false
 }
 
 // Size returns the current size of this canvas object.
 func (o *baseObject) Size() fyne.Size {
-	return o.size.Load()
+	return o.size
 }
 
 // Visible returns true if this object is visible, false otherwise.
 func (o *baseObject) Visible() bool {
-	o.propertyLock.RLock()
-	defer o.propertyLock.RUnlock()
-
 	return !o.Hidden
 }

canvas/circle.go

@@ -23,9 +23,7 @@ type Circle struct {
 
 // NewCircle returns a new Circle instance
 func NewCircle(color color.Color) *Circle {
-	return &Circle{
-		FillColor: color,
-	}
+	return &Circle{FillColor: color}
 }
 
 // Hide will set this circle to not be visible
@@ -45,7 +43,8 @@ func (c *Circle) MinSize() fyne.Size {
 func (c *Circle) Move(pos fyne.Position) {
 	size := c.Size()
 	c.Position1 = pos
-	c.Position2 = fyne.NewPos(c.Position1.X+size.Width, c.Position1.Y+size.Height)
+	c.Position2 = c.Position1.Add(size)
+
 	repaint(c)
 }
 
@@ -66,7 +65,7 @@ func (c *Circle) Resize(size fyne.Size) {
 		return
 	}
 
-	c.Position2 = fyne.NewPos(c.Position1.X+size.Width, c.Position1.Y+size.Height)
+	c.Position2 = c.Position1.Add(size)
 
 	Refresh(c)
 }
@@ -80,8 +79,10 @@ func (c *Circle) Show() {
 
 // Size returns the current size of bounding box for this circle object
 func (c *Circle) Size() fyne.Size {
-	return fyne.NewSize(float32(math.Abs(float64(c.Position2.X)-float64(c.Position1.X))),
-		float32(math.Abs(float64(c.Position2.Y)-float64(c.Position1.Y))))
+	return fyne.NewSize(
+		float32(math.Abs(float64(c.Position2.X)-float64(c.Position1.X))),
+		float32(math.Abs(float64(c.Position2.Y)-float64(c.Position1.Y))),
+	)
 }
 
 // Visible returns true if this circle is visible, false otherwise

canvas/image.go

@@ -9,7 +9,6 @@ import (
 	"io"
 	"os"
 	"path/filepath"
-	"sync"
 
 	"fyne.io/fyne/v2"
 	"fyne.io/fyne/v2/internal/cache"
@@ -62,7 +61,6 @@ type Image struct {
 	aspect float32
 	icon   *svg.Decoder
 	isSVG  bool
-	lock   sync.Mutex
 
 	// one of the following sources will provide our image data
 	File     string        // Load the image from a file
@@ -116,9 +114,6 @@ func (i *Image) Move(pos fyne.Position) {
 
 // Refresh causes this image to be redrawn with its configured state.
 func (i *Image) Refresh() {
-	i.lock.Lock()
-	defer i.lock.Unlock()
-
 	rc, err := i.updateReader()
 	if err != nil {
 		fyne.LogError("Failed to load image", err)

canvas/line.go

@@ -24,8 +24,10 @@ type Line struct {
 
 // Size returns the current size of bounding box for this line object
 func (l *Line) Size() fyne.Size {
-	return fyne.NewSize(float32(math.Abs(float64(l.Position2.X)-float64(l.Position1.X))),
-		float32(math.Abs(float64(l.Position2.Y)-float64(l.Position1.Y))))
+	return fyne.NewSize(
+		float32(math.Abs(float64(l.Position2.X)-float64(l.Position1.X))),
+		float32(math.Abs(float64(l.Position2.Y)-float64(l.Position1.Y))),
+	)
 }
 
 // Resize sets a new bottom-right position for the line object, then it will then be refreshed.

container.go

@@ -1,7 +1,5 @@
 package fyne
 
-import "sync"
-
 // Declare conformity to [CanvasObject]
 var _ CanvasObject = (*Container)(nil)
 
@@ -12,8 +10,7 @@ type Container struct {
 	position Position // The current position of the Container
 	Hidden   bool     // Is this Container hidden
 
-	Layout  Layout // The Layout algorithm for arranging child [CanvasObject]s
-	lock    sync.Mutex
+	Layout  Layout         // The Layout algorithm for arranging child [CanvasObject]s
 	Objects []CanvasObject // The set of [CanvasObject]s this container holds
 }
 
@@ -60,8 +57,6 @@ func (c *Container) Add(add CanvasObject) {
 		return
 	}
 
-	c.lock.Lock()
-	defer c.lock.Unlock()
 	c.Objects = append(c.Objects, add)
 	c.layout()
 }
@@ -129,8 +124,6 @@ func (c *Container) Refresh() {
 // This method is not intended to be used inside a loop, to remove all the elements.
 // It is much more efficient to call [Container.RemoveAll) instead.
 func (c *Container) Remove(rem CanvasObject) {
-	c.lock.Lock()
-	defer c.lock.Unlock()
 	if len(c.Objects) == 0 {
 		return
 	}

container_test.go

@@ -1,7 +1,6 @@
 package fyne
 
 import (
-	"sync"
 	"testing"
 
 	"github.com/stretchr/testify/assert"
@@ -107,41 +106,6 @@ func TestContainer_Remove(t *testing.T) {
 	assert.Equal(t, float32(0), box2.Position().Y)
 }
 
-func TestContainer_Remove_Race(t *testing.T) {
-	var objs []CanvasObject
-	for i := 0; i < 100; i++ {
-		objs = append(objs, new(dummyObject))
-	}
-
-	container := NewContainerWithLayout(new(customLayout), objs...)
-
-	wg := &sync.WaitGroup{}
-	wg.Add(100)
-	for _, o := range objs {
-		rmo := o
-		go func() {
-			container.Remove(rmo)
-			wg.Done()
-		}()
-	}
-	wg.Wait()
-	assert.Empty(t, container.Objects)
-}
-
-func TestContainer_Add_Race(t *testing.T) {
-	container := NewContainerWithLayout(new(customLayout))
-	wg := &sync.WaitGroup{}
-	wg.Add(100)
-	for i := 0; i < 100; i++ {
-		go func() {
-			container.Add(new(dummyObject))
-			wg.Done()
-		}()
-	}
-	wg.Wait()
-	assert.Len(t, container.Objects, 100)
-}
-
 func TestContainer_RemoveAll(t *testing.T) {
 	box1 := new(dummyObject)
 	box2 := new(dummyObject)

dialog/file_unix.go

@@ -33,6 +33,6 @@ func isHidden(file fyne.URI) bool {
 	return name == "" || name[0] == '.'
 }
 
-func hideFile(filename string) error {
+func hideFile(_ string) error {
 	return nil
 }

dialog/file_xdg_notflatpak.go

@@ -2,10 +2,10 @@
 
 package dialog
 
-func fileOpenOSOverride(d *FileDialog) bool {
+func fileOpenOSOverride(_ *FileDialog) bool {
 	return false
 }
 
-func fileSaveOSOverride(d *FileDialog) bool {
+func fileSaveOSOverride(_ *FileDialog) bool {
 	return false
 }