From 16d8cb4a58037ad55136287d0f486ca582c12d33 Mon Sep 17 00:00:00 2001
From: Drew Weymouth <dweymouth@gmail.com>
Date: Sun, 29 Dec 2024 12:03:04 -0800
Subject: [PATCH] minor improvement to Auto theme impl

---
 ui/theme/theme.go | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/ui/theme/theme.go b/ui/theme/theme.go
index 0af1edf..5f92cbc 100644
--- a/ui/theme/theme.go
+++ b/ui/theme/theme.go
@@ -92,7 +92,7 @@ func NewMyTheme(config *backend.ThemeConfig, themeFileDir string) *MyTheme {
 	return m
 }
 
-func (m *MyTheme) Color(name fyne.ThemeColorName, _ fyne.ThemeVariant) color.Color {
+func (m *MyTheme) Color(name fyne.ThemeColorName, defVariant fyne.ThemeVariant) color.Color {
 	// load theme file if necessary
 	if m.loadedThemeFile == nil || m.config.ThemeFile != m.loadedThemeFilename {
 		t, err := ReadThemeFile(path.Join(m.themeFileDir, m.config.ThemeFile))
@@ -105,7 +105,7 @@ func (m *MyTheme) Color(name fyne.ThemeColorName, _ fyne.ThemeVariant) color.Col
 		m.loadedThemeFilename = m.config.ThemeFile
 	}
 
-	variant := m.getVariant()
+	variant := m.getVariant(defVariant)
 	thFile := m.loadedThemeFile
 	if !thFile.SupportsVariant(variant) {
 		thFile = m.defaultThemeFile
@@ -277,7 +277,7 @@ func (m *MyTheme) Size(name fyne.ThemeSizeName) float32 {
 	}
 }
 
-func (m *MyTheme) getVariant() fyne.ThemeVariant {
+func (m *MyTheme) getVariant(defVariant fyne.ThemeVariant) fyne.ThemeVariant {
 	v := DefaultAppearance // default if config has invalid or missing setting
 	if slices.Contains(
 		[]string{string(AppearanceLight), string(AppearanceDark), string(AppearanceAuto)},
@@ -290,7 +290,7 @@ func (m *MyTheme) getVariant() fyne.ThemeVariant {
 	} else if AppearanceMode(v) == AppearanceLight {
 		return theme.VariantLight
 	}
-	return fyne.CurrentApp().Settings().ThemeVariant()
+	return defVariant
 }
 
 func BlendColors(a, b color.Color, fractionA float64) color.Color {