owen/supersonic
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

minor improvement to Auto theme impl

Browse Source
This commit is contained in:
Drew Weymouth
2024-12-29 12:03:04 -08:00
parent c773743e06
commit 16d8cb4a58
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ui/theme/theme.go
+4 -4
View File
@@ -92,7 +92,7 @@ func NewMyTheme(config *backend.ThemeConfig, themeFileDir string) *MyTheme {
return m 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 // load theme file if necessary
if m.loadedThemeFile == nil || m.config.ThemeFile != m.loadedThemeFilename { if m.loadedThemeFile == nil || m.config.ThemeFile != m.loadedThemeFilename {
t, err := ReadThemeFile(path.Join(m.themeFileDir, m.config.ThemeFile)) 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 m.loadedThemeFilename = m.config.ThemeFile
} }
variant := m.getVariant() variant := m.getVariant(defVariant)
thFile := m.loadedThemeFile thFile := m.loadedThemeFile
if !thFile.SupportsVariant(variant) { if !thFile.SupportsVariant(variant) {
thFile = m.defaultThemeFile 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 v := DefaultAppearance // default if config has invalid or missing setting
if slices.Contains( if slices.Contains(
[]string{string(AppearanceLight), string(AppearanceDark), string(AppearanceAuto)}, []string{string(AppearanceLight), string(AppearanceDark), string(AppearanceAuto)},
@@ -290,7 +290,7 @@ func (m *MyTheme) getVariant() fyne.ThemeVariant {
} else if AppearanceMode(v) == AppearanceLight { } else if AppearanceMode(v) == AppearanceLight {
return theme.VariantLight return theme.VariantLight
} }
return fyne.CurrentApp().Settings().ThemeVariant() return defVariant
} }
func BlendColors(a, b color.Color, fractionA float64) color.Color { func BlendColors(a, b color.Color, fractionA float64) color.Color {