From 5932b66e53d3356ec92a168bd17797e88da96002 Mon Sep 17 00:00:00 2001 From: ayn2op Date: Sun, 30 Mar 2025 10:59:32 -0400 Subject: [PATCH] feat(config): add theme.active_title_color field --- cmd/guilds_tree.go | 2 ++ cmd/message_input.go | 2 ++ cmd/messages_text.go | 2 ++ cmd/root.go | 1 - internal/config/theme.go | 24 +++++++++++++++--------- 5 files changed, 21 insertions(+), 10 deletions(-) diff --git a/cmd/guilds_tree.go b/cmd/guilds_tree.go index e2d781a..a6a7b52 100644 --- a/cmd/guilds_tree.go +++ b/cmd/guilds_tree.go @@ -45,9 +45,11 @@ func newGuildsTree(app *tview.Application, cfg *config.Config) *GuildsTree { SetBorderPadding(p[0], p[1], p[2], p[3]). SetFocusFunc(func() { gt.SetBorderColor(tcell.GetColor(b.ActiveColor)) + gt.SetTitleColor(tcell.GetColor(t.ActiveTitleColor)) }). SetBlurFunc(func() { gt.SetBorderColor(tcell.GetColor(b.Color)) + gt.SetTitleColor(tcell.GetColor(t.TitleColor)) }) return gt diff --git a/cmd/message_input.go b/cmd/message_input.go index 6c9bc25..ae97f0a 100644 --- a/cmd/message_input.go +++ b/cmd/message_input.go @@ -51,9 +51,11 @@ func newMessageInput(app *tview.Application, cfg *config.Config) *MessageInput { SetBorderPadding(p[0], p[1], p[2], p[3]). SetFocusFunc(func() { mi.SetBorderColor(tcell.GetColor(b.ActiveColor)) + mi.SetTitleColor(tcell.GetColor(t.ActiveTitleColor)) }). SetBlurFunc(func() { mi.SetBorderColor(tcell.GetColor(b.Color)) + mi.SetTitleColor(tcell.GetColor(t.TitleColor)) }) return mi diff --git a/cmd/messages_text.go b/cmd/messages_text.go index dbfc8f7..5e2d553 100644 --- a/cmd/messages_text.go +++ b/cmd/messages_text.go @@ -60,9 +60,11 @@ func newMessagesText(app *tview.Application, cfg *config.Config) *MessagesText { SetBorderPadding(p[0], p[1], p[2], p[3]). SetFocusFunc(func() { mt.SetBorderColor(tcell.GetColor(b.ActiveColor)) + mt.SetTitleColor(tcell.GetColor(t.ActiveTitleColor)) }). SetBlurFunc(func() { mt.SetBorderColor(tcell.GetColor(b.Color)) + mt.SetTitleColor(tcell.GetColor(t.TitleColor)) }) markdown.DefaultRenderer.AddOptions( diff --git a/cmd/root.go b/cmd/root.go index 2e1302f..8437937 100644 --- a/cmd/root.go +++ b/cmd/root.go @@ -39,7 +39,6 @@ var ( } tview.Styles.PrimitiveBackgroundColor = tcell.GetColor(cfg.Theme.BackgroundColor) - tview.Styles.TitleColor = tcell.GetColor(cfg.Theme.TitleColor) tview.Borders.Horizontal = cfg.Theme.Border.Preset.Horizontal tview.Borders.Vertical = cfg.Theme.Border.Preset.Vertical diff --git a/internal/config/theme.go b/internal/config/theme.go index 54ba76a..cae666a 100644 --- a/internal/config/theme.go +++ b/internal/config/theme.go @@ -61,17 +61,21 @@ type ( Enabled bool `toml:"enabled"` Padding [4]int `toml:"padding"` - Color string `toml:"color"` - ActiveColor string `toml:"active_color"` - Preset BorderPreset `toml:"preset"` + Color string `toml:"color"` + ActiveColor string `toml:"active_color"` + + Preset BorderPreset `toml:"preset"` } Theme struct { - TitleColor string `toml:"title_color"` - BackgroundColor string `toml:"background_color"` - Border BorderTheme `toml:"border"` - GuildsTree GuildsTreeTheme `toml:"guilds_tree"` - MessagesText MessagesTextTheme `toml:"messages_text"` + BackgroundColor string `toml:"background_color"` + + TitleColor string `toml:"title_color"` + ActiveTitleColor string `toml:"active_title_color"` + + Border BorderTheme `toml:"border"` + GuildsTree GuildsTreeTheme `toml:"guilds_tree"` + MessagesText MessagesTextTheme `toml:"messages_text"` } GuildsTreeTheme struct { @@ -113,7 +117,9 @@ func defaultTheme() Theme { }, BackgroundColor: "default", - TitleColor: "default", + + TitleColor: "default", + ActiveTitleColor: "green", GuildsTree: GuildsTreeTheme{ AutoExpandFolders: true,