Merge pull request #5558 from Jacalz/dynamic-array-size

fyne-io · Feb 26, 2025 · 0cc601e · 0cc601e
2 parents cbb0fd3 + 7108d38
commit 0cc601e
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 6 deletions.
diff --git a/cmd/fyne_settings/settings/scale.go b/cmd/fyne_settings/settings/scale.go
@@ -15,7 +15,7 @@ type scaleItems struct {
 	button  *widget.Button
 }
 
-var scales = []*scaleItems{
+var scales = [...]*scaleItems{
 	{scale: 0.5, name: "Tiny"},
 	{scale: 0.8, name: "Small"},
 	{scale: 1, name: "Normal"},

diff --git a/internal/painter/gl/gl_core.go b/internal/painter/gl/gl_core.go
@@ -57,7 +57,7 @@ type (
 	Uniform int32
 )
 
-var textureFilterToGL = []int32{gl.LINEAR, gl.NEAREST, gl.LINEAR}
+var textureFilterToGL = [...]int32{gl.LINEAR, gl.NEAREST, gl.LINEAR}
 
 func (p *painter) Init() {
 	p.ctx = &coreContext{}

diff --git a/internal/painter/gl/gl_es.go b/internal/painter/gl/gl_es.go
@@ -57,7 +57,7 @@ type (
 	Uniform int32
 )
 
-var textureFilterToGL = []int32{gl.LINEAR, gl.NEAREST, gl.LINEAR}
+var textureFilterToGL = [...]int32{gl.LINEAR, gl.NEAREST, gl.LINEAR}
 
 func (p *painter) Init() {
 	p.ctx = &esContext{}

diff --git a/internal/painter/gl/gl_gomobile.go b/internal/painter/gl/gl_gomobile.go
@@ -57,7 +57,7 @@ type (
 var compiled []Program // avoid multiple compilations with the re-used mobile GUI context
 var noBuffer = Buffer{}
 var noShader = Shader{}
-var textureFilterToGL = []int32{gl.Linear, gl.Nearest}
+var textureFilterToGL = [...]int32{gl.Linear, gl.Nearest}
 
 func (p *painter) glctx() gl.Context {
 	return p.contextProvider.Context().(gl.Context)

diff --git a/internal/painter/gl/gl_wasm.go b/internal/painter/gl/gl_wasm.go
@@ -54,7 +54,7 @@ type (
 
 var noBuffer = Buffer(gl.NoBuffer)
 var noShader = Shader(gl.NoShader)
-var textureFilterToGL = []int32{gl.LINEAR, gl.NEAREST}
+var textureFilterToGL = [...]int32{gl.LINEAR, gl.NEAREST}
 
 func (p *painter) Init() {
 	p.ctx = &xjsContext{}

diff --git a/test/theme.go b/test/theme.go
@@ -14,7 +14,7 @@ import (
 var defaultTheme fyne.Theme
 
 // Try to keep these in sync with the existing color names at theme/color.go.
-var knownColorNames = []fyne.ThemeColorName{
+var knownColorNames = [...]fyne.ThemeColorName{
 	theme.ColorNameBackground,
 	theme.ColorNameButton,
 	theme.ColorNameDisabled,