diff options
author | Konstantin Shelekhin <k.shelekhin@ftml.net> | 2023-08-07 03:10:41 +0300 |
---|---|---|
committer | Robin Jarry <robin@jarry.cc> | 2023-08-11 21:33:02 +0200 |
commit | 4443536dc03d5c9b0e09fef544f44e9e5c36ffcb (patch) | |
tree | 2d71780162805b20a1fe5f8e9fd8c365edf42932 | |
parent | cf2f7504993eb1682df3fd66b868764d51c46794 (diff) | |
download | aerc-4443536dc03d5c9b0e09fef544f44e9e5c36ffcb.tar.gz aerc-4443536dc03d5c9b0e09fef544f44e9e5c36ffcb.zip |
style: add msglist_gutter and msglist_pill to config
Allow a user to change the default style of the message list scrollbar.
There is no easy way to set the default style for an object directly in
code, so I've updated every built-in theme to preserve the existing
style.
Signed-off-by: Konstantin Shelekhin <k.shelekhin@ftml.net>
Acked-by: Robin Jarry <robin@jarry.cc>
-rw-r--r-- | CHANGELOG.md | 1 | ||||
-rw-r--r-- | config/style.go | 4 | ||||
-rw-r--r-- | doc/aerc-stylesets.7.scd | 4 | ||||
-rw-r--r-- | stylesets/blue | 1 | ||||
-rw-r--r-- | stylesets/default | 1 | ||||
-rw-r--r-- | stylesets/dracula | 1 | ||||
-rw-r--r-- | stylesets/nord | 2 | ||||
-rw-r--r-- | stylesets/pink | 1 | ||||
-rw-r--r-- | stylesets/solarized | 1 | ||||
-rw-r--r-- | widgets/msglist.go | 5 |
10 files changed, 19 insertions, 2 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index e4d63bd4..4ff6bbd0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -24,6 +24,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). `:compose`, `:forward`, `:recall`, etc.). - Remove headers from the compose window with `:header -d <name>`. - Add option `-r` to `:attach` to pipe the attachments in. +- Add `msglist_gutter` and `msglist_pill` styles for message list scrollbar. ### Fixed diff --git a/config/style.go b/config/style.go index 417f42b6..2b1ef41a 100644 --- a/config/style.go +++ b/config/style.go @@ -40,6 +40,8 @@ const ( STYLE_MSGLIST_RESULT STYLE_MSGLIST_ANSWERED STYLE_MSGLIST_THREAD_FOLDED + STYLE_MSGLIST_GUTTER + STYLE_MSGLIST_PILL STYLE_DIRLIST_DEFAULT STYLE_DIRLIST_UNREAD @@ -81,6 +83,8 @@ var StyleNames = map[string]StyleObject{ "msglist_marked": STYLE_MSGLIST_MARKED, "msglist_result": STYLE_MSGLIST_RESULT, "msglist_answered": STYLE_MSGLIST_ANSWERED, + "msglist_gutter": STYLE_MSGLIST_GUTTER, + "msglist_pill": STYLE_MSGLIST_PILL, "msglist_thread_folded": STYLE_MSGLIST_THREAD_FOLDED, diff --git a/doc/aerc-stylesets.7.scd b/doc/aerc-stylesets.7.scd index 54736434..9d54e0be 100644 --- a/doc/aerc-stylesets.7.scd +++ b/doc/aerc-stylesets.7.scd @@ -109,6 +109,10 @@ styling. : The messages which match the current search. | *msglist_answered* : The messages marked as answered. +| *msglist_gutter* +: The message list gutter. +| *msglist_pill* +: The message list pill. | *dirlist_default* : The default style for directories in the directory list. | *dirlist_unread* diff --git a/stylesets/blue b/stylesets/blue index c3e8c47e..c598ef92 100644 --- a/stylesets/blue +++ b/stylesets/blue @@ -32,6 +32,7 @@ msglist_marked.fg=white msglist_marked.selected.fg=white msglist_marked.bg=#005f87 msglist_marked.selected.bg=#005fff +msglist_pill.reverse=true completion_pill.reverse=true selector_focused.bold=true diff --git a/stylesets/default b/stylesets/default index 19eeb03d..f3ea2733 100644 --- a/stylesets/default +++ b/stylesets/default @@ -27,6 +27,7 @@ statusline_warning.reverse=true msglist_unread.bold=true msglist_deleted.fg=gray msglist_result.fg=green +msglist_pill.reverse=true completion_pill.reverse=true diff --git a/stylesets/dracula b/stylesets/dracula index c400865a..9e24f422 100644 --- a/stylesets/dracula +++ b/stylesets/dracula @@ -32,6 +32,7 @@ msglist_marked.fg=black msglist_marked.selected.fg=black msglist_marked.bg=#BD93F9 msglist_marked.selected.bg=#9956f5 +msglist_pill.reverse=true completion_pill.reverse=false selector_focused.bold=false diff --git a/stylesets/nord b/stylesets/nord index 8f7d5140..f099a43f 100644 --- a/stylesets/nord +++ b/stylesets/nord @@ -34,6 +34,8 @@ msglist_flagged.bold=true msglist_unread.fg=#8fbcbb msglist_unread.selected.bg=#88C0D0 +msglist_pill.reverse=true + statusline_default.fg=#49576b statusline_error.fg=#94545d diff --git a/stylesets/pink b/stylesets/pink index eb76a3f6..1f73d0f7 100644 --- a/stylesets/pink +++ b/stylesets/pink @@ -34,6 +34,7 @@ msglist_marked.fg=white msglist_marked.selected.fg=white msglist_marked.bg=#de4e85 msglist_marked.selected.bg=#c93687 +msglist_pill.reverse=true completion_pill.reverse=true selector_focused.bold=true diff --git a/stylesets/solarized b/stylesets/solarized index 2d65e1a0..026c3755 100644 --- a/stylesets/solarized +++ b/stylesets/solarized @@ -23,6 +23,7 @@ msglist_marked.bg=#81a1c1 msglist_unread.fg=#b58900 msglist_unread.selected.bg=#b58900 msglist_unread.selected.fg=#002b36 +msglist_pill.reverse=true statusline_*.bg=#859900 statusline_*.fg=#002b36 statusline_error.bg=#d33682 diff --git a/widgets/msglist.go b/widgets/msglist.go index a334d0d4..dcb4cd31 100644 --- a/widgets/msglist.go +++ b/widgets/msglist.go @@ -237,8 +237,9 @@ func addMessage( } func (ml *MessageList) drawScrollbar(ctx *ui.Context) { - gutterStyle := tcell.StyleDefault - pillStyle := tcell.StyleDefault.Reverse(true) + uiConfig := ml.aerc.SelectedAccountUiConfig() + gutterStyle := uiConfig.GetStyle(config.STYLE_MSGLIST_GUTTER) + pillStyle := uiConfig.GetStyle(config.STYLE_MSGLIST_PILL) // gutter ctx.Fill(0, 0, 1, ctx.Height(), ' ', gutterStyle) |