Merge pull request #5326 from Jacalz/no-time-func-per-cursor

fyne-io · Dec 17, 2024 · c6d4727 · c6d4727
2 parents d2fde27 + 307be7d
commit c6d4727
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 11 deletions.
diff --git a/internal/cache/base.go b/internal/cache/base.go
@@ -16,7 +16,7 @@ var (
 	skippedCleanWithCanvasRefresh = false
 
 	// testing purpose only
-	timeNow func() time.Time = time.Now
+	timeNow = time.Now
 )
 
 func init() {

diff --git a/widget/entry_cursor_anim.go b/widget/entry_cursor_anim.go
@@ -11,24 +11,23 @@ import (
 	"fyne.io/fyne/v2/theme"
 )
 
+var timeNow = time.Now // used in tests
+
 const (
 	cursorInterruptTime = 300 * time.Millisecond
 	cursorFadeAlpha     = uint8(0x16)
 	cursorFadeRatio     = 0.1
 )
 
 type entryCursorAnimation struct {
-	mu                *sync.RWMutex
+	mu                sync.RWMutex
 	cursor            *canvas.Rectangle
 	anim              *fyne.Animation
 	lastInterruptTime time.Time
-
-	timeNow func() time.Time // useful for testing
 }
 
 func newEntryCursorAnimation(cursor *canvas.Rectangle) *entryCursorAnimation {
-	a := &entryCursorAnimation{mu: &sync.RWMutex{}, cursor: cursor, timeNow: time.Now}
-	return a
+	return &entryCursorAnimation{cursor: cursor}
 }
 
 // creates fyne animation
@@ -55,7 +54,7 @@ func (a *entryCursorAnimation) createAnim(inverted bool) *fyne.Animation {
 	interrupted := false
 	anim := fyne.NewAnimation(time.Second/2, func(f float32) {
 		a.mu.RLock()
-		shouldInterrupt := a.timeNow().Sub(a.lastInterruptTime) <= cursorInterruptTime
+		shouldInterrupt := timeNow().Sub(a.lastInterruptTime) <= cursorInterruptTime
 		a.mu.RUnlock()
 		if shouldInterrupt {
 			if !interrupted {
@@ -127,7 +126,7 @@ func (a *entryCursorAnimation) start() {
 // temporarily stops the animation by "cursorInterruptTime".
 func (a *entryCursorAnimation) interrupt() {
 	a.mu.Lock()
-	a.lastInterruptTime = a.timeNow()
+	a.lastInterruptTime = timeNow()
 	a.mu.Unlock()
 }
 

diff --git a/widget/entry_cursor_anim_test.go b/widget/entry_cursor_anim_test.go
@@ -42,7 +42,7 @@ func TestEntryCursorAnim(t *testing.T) {
 	a.anim.Tick(1.0)
 	assert.True(t, alphaEquals(cursorOpaque, a.cursor.FillColor))
 
-	a.timeNow = func() time.Time {
+	timeNow = func() time.Time {
 		return time.Now().Add(cursorInterruptTime)
 	}
 	// animation should be restarted inverting the colors
@@ -54,12 +54,12 @@ func TestEntryCursorAnim(t *testing.T) {
 	a.anim.Tick(1.0)
 	assert.True(t, alphaEquals(cursorDim, a.cursor.FillColor))
 
-	a.timeNow = time.Now
+	timeNow = time.Now
 	a.interrupt()
 	a.anim.Tick(0.0)
 	assert.True(t, alphaEquals(cursorOpaque, a.cursor.FillColor))
 
-	a.timeNow = func() time.Time {
+	timeNow = func() time.Time {
 		return time.Now().Add(cursorInterruptTime)
 	}
 	a.anim.Tick(0.0)