Merge pull request #5251 from Jacalz/no_animations

fyne-io · Nov 20, 2024 · 9476f0f · 9476f0f
2 parents b3f9766 + 370d051
commit 9476f0f
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 10 deletions.
diff --git a/app/settings.go b/app/settings.go
@@ -12,8 +12,6 @@ import (
 	"fyne.io/fyne/v2/theme"
 )
 
-var noAnimations bool // set to true at compile time if no_animations tag is passed
-
 // SettingsSchema is used for loading and storing global settings
 type SettingsSchema struct {
 	// these items are used for global settings load
@@ -82,7 +80,7 @@ func (s *settings) SetTheme(theme fyne.Theme) {
 }
 
 func (s *settings) ShowAnimations() bool {
-	return !s.schema.DisableAnimations && !noAnimations
+	return !s.schema.DisableAnimations && !build.NoAnimations
 }
 
 func (s *settings) ThemeVariant() fyne.ThemeVariant {

diff --git a/app/settings_noanimation.go b/app/settings_noanimation.go
diff --git a/internal/build/animations_disabled.go b/internal/build/animations_disabled.go
@@ -0,0 +1,7 @@
+//go:build no_animations
+
+package build
+
+// NoAnimations is true if the application was built without animations by
+// passing the no_animations build tag.
+const NoAnimations = true
diff --git a/internal/build/animations_enabled.go b/internal/build/animations_enabled.go
@@ -0,0 +1,7 @@
+//go:build !no_animations
+
+package build
+
+// NoAnimations is true if the application was built without animations by
+// passing the no_animations build tag.
+const NoAnimations = false