From 2519974e8453a741fa9b92b5f49ffb3a3f14c451 Mon Sep 17 00:00:00 2001 From: devangpratap <115096812+devangpratap@users.noreply.github.com> Date: Mon, 26 Oct 2026 14:05:23 -0400 Subject: [PATCH] desktop-ui: Fix an invalid accent_color breaking the appearance settings --- kittens/desktop_ui/main.py | 7 ++++++- kittens/desktop_ui/portal.go | 11 ++++++++--- kittens/desktop_ui/portal_test.go | 23 +++++++++++++++++++++++ 3 files changed, 37 insertions(+), 4 deletions(-) create mode 100644 kittens/desktop_ui/portal_test.go diff --git a/kittens/desktop_ui/main.py b/kittens/desktop_ui/main.py index 1b76fa3cf..bebe0e52a 100644 --- a/kittens/desktop_ui/main.py +++ b/kittens/desktop_ui/main.py @@ -26,7 +26,12 @@ The color scheme for your system. This sets the initial value of the color schem by using :code:`kitten desktop-ui color-scheme`. """, ) -opt('accent_color', 'cyan', long_text='The RGB accent color for your system, can be specified as a color name or in hex a decimal format.') +opt( + 'accent_color', + 'cyan', + option_type='to_color', + long_text='The RGB accent color for your system, can be specified as a color name or in hex a decimal format.', +) opt('contrast', 'normal', choices=('normal', 'high'), long_text='The preferred contrast level.') opt( 'file_chooser_size', diff --git a/kittens/desktop_ui/portal.go b/kittens/desktop_ui/portal.go index b6e3def9d..518274ac0 100644 --- a/kittens/desktop_ui/portal.go +++ b/kittens/desktop_ui/portal.go @@ -71,9 +71,14 @@ type Portal struct { file_chooser_first_instance_exited chan struct{} } +func color_variant(col style.RGBA) dbus.Variant { + return dbus.MakeVariant([]float64{float64(col.Red) / 255., float64(col.Green) / 255., float64(col.Blue) / 255.}) +} + func to_color(spec string) (v dbus.Variant, err error) { - if col, err := style.ParseColor(spec); err == nil { - return dbus.MakeVariant([]float64{float64(col.Red) / 255., float64(col.Green) / 255., float64(col.Blue) / 255.}), nil + col, err := style.ParseColor(spec) + if err == nil { + v = color_variant(col) } return } @@ -94,7 +99,7 @@ func NewPortal(opts *Config, server_options *ServerOptions) (p *Portal, err erro default: ans.settings[PORTAL_APPEARANCE_NAMESPACE][PORTAL_COLOR_SCHEME_KEY] = dbus.MakeVariant(uint32(NO_PREFERENCE)) } - ans.settings[PORTAL_APPEARANCE_NAMESPACE][PORTAL_ACCENT_COLOR_KEY], err = to_color(opts.Accent_color) + ans.settings[PORTAL_APPEARANCE_NAMESPACE][PORTAL_ACCENT_COLOR_KEY] = color_variant(opts.Accent_color) var contrast uint32 if opts.Contrast == Contrast_high { contrast = 1 diff --git a/kittens/desktop_ui/portal_test.go b/kittens/desktop_ui/portal_test.go new file mode 100644 index 000000000..e1689c817 --- /dev/null +++ b/kittens/desktop_ui/portal_test.go @@ -0,0 +1,23 @@ +// License: GPLv3 Copyright: 2026, kitty contributors + +package desktop_ui + +import ( + "testing" +) + +func TestInvalidAccentColor(t *testing.T) { + if _, err := to_color("cyan"); err != nil { + t.Fatalf("Valid accent color rejected: %s", err) + } + if v, err := to_color("not-a-color"); err == nil { + t.Fatalf("Invalid accent color accepted as: %#v", v) + } + c := NewConfig() + if err := c.Parse("accent_color", "not-a-color"); err == nil { + t.Fatalf("Invalid accent_color accepted in config as: %#v", c.Accent_color) + } + if c.Accent_color != NewConfig().Accent_color { + t.Fatalf("Invalid accent_color in config changed the default to: %#v", c.Accent_color) + } +}