Cache text texture per-canvas so it matches the OpenGL context

fyne-io · Dec 2, 2024 · 2105020 · 2105020
1 parent 96f2ae1
commit 2105020
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/internal/cache/text.go b/internal/cache/text.go
@@ -29,7 +29,8 @@ type fontSizeEntry struct {
 type FontCacheEntry struct {
 	fontSizeEntry
 
-	Color color.Color
+	Canvas fyne.Canvas
+	Color  color.Color
 }
 
 // GetFontMetrics looks up a calculated size and baseline required for the specified text parameters.

diff --git a/internal/painter/gl/texture.go b/internal/painter/gl/texture.go
@@ -38,7 +38,7 @@ func (p *painter) getTexture(object fyne.CanvasObject, creator func(canvasObject
 		if t.FontSource != nil {
 			custom = t.FontSource.Name()
 		}
-		ent := cache.FontCacheEntry{Color: t.Color}
+		ent := cache.FontCacheEntry{Color: t.Color, Canvas: p.canvas}
 		ent.Text = t.Text
 		ent.Size = t.TextSize
 		ent.Style = t.TextStyle