Only change variant when color scheme changes

Author: Jacalz

app/app_xdg.go

@@ -122,14 +122,15 @@ func rootConfigDir() string {
 func watchTheme(s *settings) {
 	go func() {
 		// Theme lookup hangs on some desktops. Update theme variant cache from within goroutine.
-		internalapp.CurrentVariant.Store(uint64(findFreedesktopColorScheme()))
-		s.setupTheme()
+		themeVariant := findFreedesktopColorScheme()
+		internalapp.CurrentVariant.Store(uint64(themeVariant))
+		s.applyVariant(themeVariant)
 
 		portalSettings.OnSignalSettingChanged(func(changed portalSettings.Changed) {
 			if changed.Namespace == "org.freedesktop.appearance" && changed.Key == "color-scheme" {
 				themeVariant := colorSchemeToThemeVariant(appearance.ColorScheme(changed.Value.(uint32)))
 				internalapp.CurrentVariant.Store(uint64(themeVariant))
-				s.setupTheme()
+				s.applyVariant(themeVariant)
 			}
 		})
 	}()

app/settings.go

@@ -97,6 +97,13 @@ func (s *settings) applyTheme(theme fyne.Theme, variant fyne.ThemeVariant) {
 	s.apply()
 }
 
+func (s *settings) applyVariant(variant fyne.ThemeVariant) {
+	s.propertyLock.Lock()
+	defer s.propertyLock.Unlock()
+	s.variant = variant
+	s.apply()
+}
+
 func (s *settings) Scale() float32 {
 	s.propertyLock.RLock()
 	defer s.propertyLock.RUnlock()