Remove constant debug field from canvas

app/settings.go

@@ -7,6 +7,7 @@ import (
 	"sync"
 
 	"fyne.io/fyne/v2"
+	"fyne.io/fyne/v2/internal/build"
 	"fyne.io/fyne/v2/theme"
 )
 
@@ -44,7 +45,7 @@ type settings struct {
 }
 
 func (s *settings) BuildType() fyne.BuildType {
-	return buildMode
+	return build.Mode
 }
 
 func (s *settings) PrimaryColor() string {

app/settings_test.go

@@ -8,6 +8,7 @@ import (
 	"fyne.io/fyne/v2"
 	"github.com/stretchr/testify/assert"
 
+	"fyne.io/fyne/v2/internal/build"
 	"fyne.io/fyne/v2/test"
 	"fyne.io/fyne/v2/theme"
 )
@@ -17,7 +18,7 @@ func TestSettingsBuildType(t *testing.T) {
 	assert.Equal(t, fyne.BuildStandard, set.BuildType()) // during test we should have a normal build
 
 	set = &settings{}
-	assert.Equal(t, buildMode, set.BuildType()) // when testing this package only it could be debug or release
+	assert.Equal(t, build.Mode, set.BuildType()) // when testing this package only it could be debug or release
 }
 
 func TestSettingsLoad(t *testing.T) {

internal/build/build.go

@@ -0,0 +1,2 @@
+// Package build contains information about they type of build currently running.
+package build

internal/build/driver_notwayland.go

@@ -0,0 +1,7 @@
+//go:build !wayland
+// +build !wayland
+
+package build
+
+// IsWayland is true when compiling for the wayland windowing system.
+const IsWayland = false

internal/build/driver_wayland.go

@@ -0,0 +1,7 @@
+//go:build wayland
+// +build wayland
+
+package build
+
+// IsWayland is true when compiling for the wayland windowing system.
+const IsWayland = true

internal/build/mode_debug.go

@@ -0,0 +1,9 @@
+//go:build debug
+// +build debug
+
+package build
+
+import "fyne.io/fyne/v2"
+
+// Mode is the application's build mode.
+const Mode = fyne.BuildDebug

internal/build/mode_release.go

@@ -0,0 +1,9 @@
+//go:build release
+// +build release
+
+package build
+
+import "fyne.io/fyne/v2"
+
+// Mode is the application's build mode.
+const Mode = fyne.BuildRelease

internal/build/mode_standard.go

@@ -0,0 +1,9 @@
+//go:build !debug && !release
+// +build !debug,!release
+
+package build
+
+import "fyne.io/fyne/v2"
+
+// Mode is the application's build mode.
+const Mode = fyne.BuildStandard

internal/driver/glfw/canvas.go

@@ -8,6 +8,7 @@ import (
 	"fyne.io/fyne/v2/canvas"
 	"fyne.io/fyne/v2/internal"
 	"fyne.io/fyne/v2/internal/app"
+	"fyne.io/fyne/v2/internal/build"
 	"fyne.io/fyne/v2/internal/driver"
 	"fyne.io/fyne/v2/internal/driver/common"
 	"fyne.io/fyne/v2/theme"
@@ -20,10 +21,10 @@ var _ fyne.Canvas = (*glCanvas)(nil)
 type glCanvas struct {
 	common.Canvas
 
-	content       fyne.CanvasObject
-	menu          fyne.CanvasObject
-	padded, debug bool
-	size          fyne.Size
+	content fyne.CanvasObject
+	menu    fyne.CanvasObject
+	padded  bool
+	size    fyne.Size
 
 	onTypedRune func(rune)
 	onTypedKey  func(*fyne.KeyEvent)
@@ -298,7 +299,7 @@ func (c *glCanvas) paint(size fyne.Size) {
 			}
 		}
 
-		if c.debug {
+		if build.Mode == fyne.BuildDebug {
 			c.DrawDebugOverlay(node.Obj(), pos, size)
 		}
 	}
@@ -339,6 +340,5 @@ func newCanvas() *glCanvas {
 	c := &glCanvas{scale: 1.0, texScale: 1.0, padded: true}
 	c.Initialize(c, c.overlayChanged)
 	c.setContent(&canvas.Rectangle{FillColor: theme.BackgroundColor()})
-	c.debug = fyne.CurrentApp().Settings().BuildType() == fyne.BuildDebug
 	return c
 }

internal/driver/glfw/window_desktop.go

@@ -14,6 +14,7 @@ import (
 	"fyne.io/fyne/v2"
 	"fyne.io/fyne/v2/canvas"
 	"fyne.io/fyne/v2/driver/desktop"
+	"fyne.io/fyne/v2/internal/build"
 	"fyne.io/fyne/v2/internal/driver/common"
 	"fyne.io/fyne/v2/internal/painter"
 	"fyne.io/fyne/v2/internal/painter/gl"
@@ -184,7 +185,7 @@ func (w *window) doCenterOnScreen() {
 }
 
 func (w *window) RequestFocus() {
-	if isWayland || w.view() == nil {
+	if build.IsWayland || w.view() == nil {
 		return
 	}
 
@@ -296,7 +297,7 @@ func (w *window) getMonitorForWindow() *glfw.Monitor {
 }
 
 func (w *window) detectScale() float32 {
-	if isWayland { // Wayland controls scale through content scaling
+	if build.IsWayland { // Wayland controls scale through content scaling
 		return 1.0
 	}
 	monitor := w.getMonitorForWindow()
@@ -319,7 +320,7 @@ func (w *window) resized(_ *glfw.Window, width, height int) {
 }
 
 func (w *window) scaled(_ *glfw.Window, x float32, y float32) {
-	if !isWayland { // other platforms handle this using older APIs
+	if !build.IsWayland { // other platforms handle this using older APIs
 		return
 	}
 
@@ -707,7 +708,7 @@ func (w *window) rescaleOnMain() {
 
 func (w *window) create() {
 	runOnMain(func() {
-		if !isWayland {
+		if !build.IsWayland {
 			// make the window hidden, we will set it up and then show it later
 			glfw.WindowHint(glfw.Visible, glfw.False)
 		}

internal/driver/mobile/canvas.go

@@ -30,8 +30,8 @@ type mobileCanvas struct {
 	scale            float32
 	size             fyne.Size
 
-	touched       map[int]mobile.Touchable
-	padded, debug bool
+	touched map[int]mobile.Touchable
+	padded  bool
 
 	onTypedRune func(rune)
 	onTypedKey  func(event *fyne.KeyEvent)
@@ -50,7 +50,6 @@ type mobileCanvas struct {
 // NewCanvas creates a new gomobile mobileCanvas. This is a mobileCanvas that will render on a mobile device using OpenGL.
 func NewCanvas() fyne.Canvas {
 	ret := &mobileCanvas{padded: true}
-	ret.debug = fyne.CurrentApp().Settings().BuildType() == fyne.BuildDebug
 	ret.scale = fyne.CurrentDevice().SystemScaleForWindow(nil) // we don't need a window parameter on mobile
 	ret.touched = make(map[int]mobile.Touchable)
 	ret.lastTapDownPos = make(map[int]fyne.Position)

internal/driver/mobile/driver.go

@@ -12,6 +12,7 @@ import (
 	"fyne.io/fyne/v2/internal"
 	"fyne.io/fyne/v2/internal/animation"
 	intapp "fyne.io/fyne/v2/internal/app"
+	"fyne.io/fyne/v2/internal/build"
 	"fyne.io/fyne/v2/internal/cache"
 	"fyne.io/fyne/v2/internal/driver"
 	"fyne.io/fyne/v2/internal/driver/common"
@@ -315,7 +316,7 @@ func (d *mobileDriver) paintWindow(window fyne.Window, size fyne.Size) {
 			}
 		}
 
-		if c.debug {
+		if build.Mode == fyne.BuildDebug {
 			c.DrawDebugOverlay(node.Obj(), pos, size)
 		}
 	}

internal/painter/gl/gl.go

@@ -7,6 +7,7 @@ import (
 	"runtime"
 
 	"fyne.io/fyne/v2"
+	"fyne.io/fyne/v2/internal/build"
 )
 
 const floatSize = 4
@@ -17,7 +18,7 @@ const max16bit = float32(255 * 255)
 // Receives a function as parameter, to lazily get the error code only when
 // needed, avoiding unneeded overhead.
 func logGLError(getError func() uint32) {
-	if fyne.CurrentApp().Settings().BuildType() != fyne.BuildDebug {
+	if build.Mode != fyne.BuildDebug {
 		return
 	}