Merge branch 'release/v2.6.x'

Author: andydotxyz

CHANGELOG.md

@@ -3,6 +3,23 @@
 This file lists the main changes with each version of the Fyne toolkit.
 More detailed release notes can be found on the [releases page](https://github.com/fyne-io/fyne/releases). 
 
+## 2.6.1 - 8 May 2025
+
+### Changed
+
+ * Added Russian translations
+
+### Fixed
+
+ * Activity indicator is light and not visible when a light theme is active (#5661)
+ * Unsafe use of map in RichText on 2.6.0 (#5639)
+ * Image translucency causes blurriness on small icons (#5476)
+ * Infinite progress bar snapping and doesn't loop nicely (#5433)
+ * RichTextSegment SizeName is not SizeNameText by default (#5307)
+ * When there is an offline netdrive, the file dialog will freeze (#2411)
+ * Correctly reset image cache when Resource goes to nil
+ * Data race after migration to v2.6.0 (#5713)
+
 ## 2.6.0 - 10 April 2025
 
 ### Added

canvas/image.go

@@ -70,6 +70,8 @@ type Image struct {
 	Translucency float64    // Set a translucency value > 0.0 to fade the image
 	FillMode     ImageFill  // Specify how the image should expand to fill or fit the available space
 	ScaleMode    ImageScale // Specify the type of scaling interpolation applied to the image
+
+	previousRender bool // did we successfully draw before? if so a nil content will need a reset
 }
 
 // Alpha is a convenience function that returns the alpha value for an image
@@ -131,6 +133,11 @@ func (i *Image) Refresh() {
 			return
 		}
 		rc = io.NopCloser(r)
+	} else if i.previousRender {
+		i.previousRender = false
+
+		Refresh(i)
+		return
 	} else {
 		return
 	}
@@ -165,6 +172,7 @@ func (i *Image) Refresh() {
 		}
 	}
 
+	i.previousRender = true
 	Refresh(i)
 }
 

canvas/image_test.go

@@ -9,9 +9,11 @@ import (
 	"strings"
 	"testing"
 
+	"fyne.io/fyne/v2"
 	"fyne.io/fyne/v2/canvas"
 	"fyne.io/fyne/v2/storage"
 	_ "fyne.io/fyne/v2/test"
+	"fyne.io/fyne/v2/theme"
 
 	"github.com/stretchr/testify/assert"
 )
@@ -28,6 +30,22 @@ func TestImage_TranslucencyDefault(t *testing.T) {
 	assert.Equal(t, 0.0, img.Translucency)
 }
 
+func TestImage_RefreshBlank(t *testing.T) {
+	img := &canvas.Image{}
+	img.Resize(fyne.NewSize(64, 64))
+	img.Refresh()
+	assert.Nil(t, img.Image)
+
+	img.Resource = theme.HomeIcon()
+	img.Refresh()
+	assert.NotNil(t, img.Image)
+
+	img.Image = nil
+	img.Resource = nil
+	img.Refresh()
+	assert.Nil(t, img.Image)
+}
+
 func TestNewImageFromFile(t *testing.T) {
 	pwd, _ := os.Getwd()
 	path := filepath.Join(filepath.Dir(pwd), "theme", "icons", "fyne.png")

internal/driver/glfw/loop.go

@@ -21,7 +21,7 @@ type funcData struct {
 
 // channel for queuing functions on the main thread
 var funcQueue = async.NewUnboundedChan[funcData]()
-var running atomic.Bool
+var running, drained atomic.Bool
 
 // Arrange that main.main runs on main thread.
 func init() {
@@ -36,9 +36,9 @@ func runOnMain(f func()) {
 
 // force a function f to run on the main thread and specify if we should wait for it to return
 func runOnMainWithWait(f func(), wait bool) {
-	// If we are on main just execute - otherwise add it to the main queue and wait.
-	// The "running" variable is normally false when we are on the main thread.
-	if !running.Load() {
+	// If we are on main before app run just execute - otherwise add it to the main queue and wait.
+	// We also need to run it as-is if the app is in the process of shutting down as the queue will be stopped.
+	if (!running.Load() && async.IsMainGoroutine()) || drained.Load() {
 		f()
 		return
 	}
@@ -130,6 +130,16 @@ func (d *gLDriver) runGL() {
 			if f := l.OnStopped(); f != nil {
 				l.QueueEvent(f)
 			}
+
+			// as we are shutting down make sure we drain the pending funcQueue and close it out.
+			for len(funcQueue.Out()) > 0 {
+				f := <-funcQueue.Out()
+				if f.done != nil {
+					f.done <- struct{}{}
+				}
+			}
+			drained.Store(true)
+			funcQueue.Close()
 			return
 		case f := <-funcQueue.Out():
 			f.f()

internal/painter/gl/draw.go

@@ -264,12 +264,10 @@ func (p *painter) drawTextureWithDetails(o fyne.CanvasObject, creator func(canva
 	p.defineVertexArray(p.program, "vert", 3, 5, 0)
 	p.defineVertexArray(p.program, "vertTexCoord", 2, 5, 3)
 
-	if alpha != 1.0 {
-		p.ctx.BlendColor(alpha, alpha, alpha, alpha)
-		p.ctx.BlendFunc(constantAlpha, oneMinusConstantAlpha)
-	} else {
-		p.ctx.BlendFunc(one, oneMinusSrcAlpha)
-	}
+	vertAttrib := p.ctx.GetUniformLocation(p.program, "alpha")
+	p.ctx.Uniform1f(vertAttrib, alpha)
+
+	p.ctx.BlendFunc(one, oneMinusSrcAlpha)
 	p.logError()
 
 	p.ctx.ActiveTexture(texture0)

internal/painter/gl/shaders.go

@@ -3,9 +3,15 @@
 uniform sampler2D tex;
 
 varying vec2 fragTexCoord;
+varying float fragAlpha;
 
 void main() {
     vec4 texColor = texture2D(tex, fragTexCoord);
+    texColor.a *= fragAlpha;
+    texColor.r *= fragAlpha;
+    texColor.g *= fragAlpha;
+    texColor.b *= fragAlpha;
+
     if(texColor.a < 0.01)
         discard;
     gl_FragColor = texColor;

internal/painter/gl/shaders/simple.frag

@@ -1,11 +1,16 @@
 #version 110
 
+uniform float alpha;
+
 attribute vec3 vert;
 attribute vec2 vertTexCoord;
+
 varying vec2 fragTexCoord;
+varying float fragAlpha;
 
 void main() {
     fragTexCoord = vertTexCoord;
+    fragAlpha = alpha;
 
     gl_Position = vec4(vert, 1);
 }

internal/painter/gl/shaders/simple.vert

@@ -13,9 +13,15 @@ precision lowp sampler2D;
 uniform sampler2D tex;
 
 varying vec2 fragTexCoord;
+varying float fragAlpha;
 
 void main() {
     vec4 texColor = texture2D(tex, fragTexCoord);
+    texColor.a *= fragAlpha;
+    texColor.r *= fragAlpha;
+    texColor.g *= fragAlpha;
+    texColor.b *= fragAlpha;
+
     if(texColor.a < 0.01)
         discard;
     gl_FragColor = texColor;

internal/painter/gl/shaders/simple_es.frag

@@ -10,12 +10,17 @@ precision mediump int;
 precision lowp sampler2D;
 #endif
 
+uniform float alpha;
+
 attribute vec3 vert;
 attribute vec2 vertTexCoord;
+
 varying vec2 fragTexCoord;
+varying float fragAlpha;
 
 void main() {
     fragTexCoord = vertTexCoord;
+    fragAlpha = alpha;
 
     gl_Position = vec4(vert, 1);
 }