Merge pull request #5335 from dweymouth/fix-5323

Ensure text and SVG textures re-rasterize when window is dragged to new monitor
fyne-io · Dec 23, 2024 · 03a3827 · 03a3827
2 parents eb40d8e + 91a524f
commit 03a3827
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 6 deletions.
diff --git a/internal/cache/texture_common.go b/internal/cache/texture_common.go
@@ -78,6 +78,20 @@ func RangeTexturesFor(canvas fyne.Canvas, f func(fyne.CanvasObject)) {
 	})
 }
 
+// DeleteTextTexturesFor deletes all text textures for the given canvas.
+func DeleteTextTexturesFor(canvas fyne.Canvas) {
+	textures.Range(func(key, value any) bool {
+		if _, ok := key.(FontCacheEntry); ok {
+			tinfo := value.(*textureInfo)
+			if tinfo.canvas == canvas {
+				textures.Delete(key)
+				tinfo.textFree()
+			}
+		}
+		return true
+	})
+}
+
 // SetTextTexture sets cached texture for a text run.
 func SetTextTexture(ent FontCacheEntry, texture TextureType, canvas fyne.Canvas, free func()) {
 	store(ent, texture, canvas, free)

diff --git a/internal/driver/glfw/window_desktop.go b/internal/driver/glfw/window_desktop.go
@@ -14,6 +14,7 @@ import (
 	"fyne.io/fyne/v2/container"
 	"fyne.io/fyne/v2/driver/desktop"
 	"fyne.io/fyne/v2/internal/build"
+	"fyne.io/fyne/v2/internal/cache"
 	"fyne.io/fyne/v2/internal/painter"
 	"fyne.io/fyne/v2/internal/painter/gl"
 	"fyne.io/fyne/v2/internal/scale"
@@ -699,6 +700,10 @@ func (w *window) RescaleContext() {
 	size := w.canvas.size.Max(w.canvas.MinSize())
 	newWidth, newHeight := w.screenSize(size)
 	w.viewport.SetSize(newWidth, newHeight)
+
+	// Ensure textures re-rasterize at the new scale
+	cache.DeleteTextTexturesFor(w.canvas)
+	w.canvas.content.Refresh()
 }
 
 func (w *window) create() {

diff --git a/internal/driver/glfw/window_wasm.go b/internal/driver/glfw/window_wasm.go
@@ -11,6 +11,7 @@ import (
 	"fyne.io/fyne/v2"
 	"fyne.io/fyne/v2/container"
 	"fyne.io/fyne/v2/driver/desktop"
+	"fyne.io/fyne/v2/internal/cache"
 	"fyne.io/fyne/v2/internal/painter/gl"
 	"fyne.io/fyne/v2/internal/scale"
 
@@ -468,18 +469,15 @@ func (w *window) RescaleContext() {
 		return
 	}
 
-	//	if w.fullScreen {
 	w.width, w.height = w.viewport.GetSize()
 	scaledFull := fyne.NewSize(
 		scale.ToFyneCoordinate(w.canvas, w.width),
 		scale.ToFyneCoordinate(w.canvas, w.height))
 	w.canvas.Resize(scaledFull)
-	return
-	//	}
 
-	//	size := w.canvas.size.Union(w.canvas.MinSize())
-	//	newWidth, newHeight := w.screenSize(size)
-	//	w.viewport.SetSize(newWidth, newHeight)
+	// Ensure textures re-rasterize at the new scale
+	cache.DeleteTextTexturesFor(w.canvas)
+	w.canvas.content.Refresh()
 }
 
 func (w *window) create() {