Skip to content

Don't override user choice if a) xdg lookup fails or b) system updates #5851

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
andydotxyz merged 2 commits into from
Jul 11, 2025
+10 −3
Merged

Don't override user choice if a) xdg lookup fails or b) system updates #5851

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7c3ebe8
Fix falling back to system theme if XDG has an error
andydotxyz Jul 9, 2025
460ed63
If we forced a theme then don't update
andydotxyz Jul 9, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 7 additions & 3 deletions app/app_xdg.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,8 @@ import (
"fyne.io/fyne/v2/theme"
)

const systemTheme = fyne.ThemeVariant(99)

func (a *fyneApp) OpenURL(url *url.URL) error {
if build.IsFlatpak {
err := openuri.OpenURI("", url.String(), nil)
Expand All @@ -38,7 +40,7 @@ func (a *fyneApp) OpenURL(url *url.URL) error {
func findFreedesktopColorScheme() fyne.ThemeVariant {
colorScheme, err := appearance.GetColorScheme()
if err != nil {
return theme.VariantDark
return systemTheme
}

return colorSchemeToThemeVariant(colorScheme)
Expand Down Expand Up @@ -117,8 +119,10 @@ func watchTheme(s *settings) {
go func() {
// Theme lookup hangs on some desktops. Update theme variant cache from within goroutine.
themeVariant := findFreedesktopColorScheme()
internalapp.CurrentVariant.Store(uint64(themeVariant))
fyne.Do(func() { s.applyVariant(themeVariant) })
if themeVariant != systemTheme {
internalapp.CurrentVariant.Store(uint64(themeVariant))
fyne.Do(func() { s.applyVariant(themeVariant) })
}

portalSettings.OnSignalSettingChanged(func(changed portalSettings.Changed) {
if changed.Namespace == appearance.Namespace && changed.Key == "color-scheme" {
Expand Down
3 changes: 3 additions & 0 deletions app/settings_desktop.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,9 @@ func watchFile(path string, callback func()) *fsnotify.Watcher {
}

func (s *settings) watchSettings() {
if s.themeSpecified {
return // we only watch for theme changes at this time so don't bother
}
s.watcher = watchFile(s.schema.StoragePath(), s.fileChanged)

a := fyne.CurrentApp()
Expand Down
Loading