feat(theme): respect color_scheme config in theme detection

commit: e58fb06ab0a1b04a49ab5a650246ba04d0904e0c
author: bnema · 12mo ago · 2025-10-23 20:56 UTC
parent: a417d51
signature: GPG Unverified2B82207D370127A0 The key is unknown

1 file · +18 -2

M pkg/webkit/user_content.go +18 -2


@@ -5,6 +5,7 @@ import (
5	5		"log"
6	6
7	7		"github.com/bnema/dumber/assets"
	8	+	"github.com/bnema/dumber/internal/config"
8	9		webkit "github.com/diamondburned/gotk4-webkitgtk/pkg/webkit/v6"
9	10		)
10	11

@@ -39,7 +40,22 @@ func SetupUserContentManager(view *webkit.WebView, appearanceConfigJSON string,
39	40
40	41		// Inject GTK theme detection SECOND, before color-scheme script
41	42		// The color-scheme.ts expects window.__dumber_gtk_prefers_dark to be set
42		-	prefersDark := PrefersDarkTheme()
	43	+	// Respect the ColorScheme config setting
	44	+	cfg := config.Get()
	45	+	var prefersDark bool
	46	+	switch cfg.Appearance.ColorScheme {
	47	+	case "prefer-dark":
	48	+	prefersDark = true
	49	+	log.Printf("[webkit] Using config-forced dark theme (color_scheme: prefer-dark)")
	50	+	case "prefer-light":
	51	+	prefersDark = false
	52	+	log.Printf("[webkit] Using config-forced light theme (color_scheme: prefer-light)")
	53	+	default:
	54	+	// "default" or empty - follow system GTK preference
	55	+	prefersDark = PrefersDarkTheme()
	56	+	log.Printf("[webkit] Using system GTK theme preference (color_scheme: %s)", cfg.Appearance.ColorScheme)
	57	+	}
	58	+
43	59		gtkThemeScript := fmt.Sprintf(`window.__dumber_gtk_prefers_dark = %t;`, prefersDark)
44	60		ucm.AddScript(webkit.NewUserScript(
45	61		gtkThemeScript,

@@ -48,7 +64,7 @@ func SetupUserContentManager(view *webkit.WebView, appearanceConfigJSON string,
48	64		nil,
49	65		nil,
50	66		))
51		-	log.Printf("[webkit] Injected GTK theme preference: prefersDark=%t", prefersDark)
	67	+	log.Printf("[webkit] Injected theme preference: prefersDark=%t", prefersDark)
52	68
53	69		// Inject palette config SECOND, before GUI scripts
54	70		// The GUI expects window.__dumber_palette = { "light": {...}, "dark": {...} }

 	"log"
 	"github.com/bnema/dumber/assets"
+	"github.com/bnema/dumber/internal/config"
 	webkit "github.com/diamondburned/gotk4-webkitgtk/pkg/webkit/v6"
 )
 	// Inject GTK theme detection SECOND, before color-scheme script
 	// The color-scheme.ts expects window.__dumber_gtk_prefers_dark to be set
-	prefersDark := PrefersDarkTheme()
+	// Respect the ColorScheme config setting
+	cfg := config.Get()
+	var prefersDark bool
+	switch cfg.Appearance.ColorScheme {
+	case "prefer-dark":
+		prefersDark = true
+		log.Printf("[webkit] Using config-forced dark theme (color_scheme: prefer-dark)")
+	case "prefer-light":
+		prefersDark = false
+		log.Printf("[webkit] Using config-forced light theme (color_scheme: prefer-light)")
+	default:
+		// "default" or empty - follow system GTK preference
+		prefersDark = PrefersDarkTheme()
+		log.Printf("[webkit] Using system GTK theme preference (color_scheme: %s)", cfg.Appearance.ColorScheme)
+	}
 	gtkThemeScript := fmt.Sprintf(`window.__dumber_gtk_prefers_dark = %t;`, prefersDark)
 	ucm.AddScript(webkit.NewUserScript(
 		gtkThemeScript,
 		nil,
 		nil,
 	))
-	log.Printf("[webkit] Injected GTK theme preference: prefersDark=%t", prefersDark)
+	log.Printf("[webkit] Injected theme preference: prefersDark=%t", prefersDark)
 	// Inject palette config SECOND, before GUI scripts
 	// The GUI expects window.__dumber_palette = { "light": {...}, "dark": {...} }