diff options
author | Reto Brunner <reto@labrat.space> | 2020-05-27 07:37:02 +0200 |
---|---|---|
committer | Reto Brunner <reto@labrat.space> | 2020-05-27 07:57:10 +0200 |
commit | 0f78f06610c0e8887aba2ae50e99b86477a384b3 (patch) | |
tree | ff4cd6581d3af0911954a37550602366d2bb0e2f /widgets/status.go | |
parent | 6c4ed3cfe2fe66a1e5f26c404ea90e048142db72 (diff) | |
download | aerc-0f78f06610c0e8887aba2ae50e99b86477a384b3.tar.gz |
Add Style configuration
The following functionalities are added to configure aerc ui styles.
- Read stylesets from file with very basic fnmatch wildcard matching
- Add default styleset
- Support different stylesets as part of UiConfig allowing contextual
styles.
- Move widgets/ui elements to use the stylesets.
- Add configuration manual for the styleset
Diffstat (limited to 'widgets/status.go')
-rw-r--r-- | widgets/status.go | 49 |
1 files changed, 33 insertions, 16 deletions
diff --git a/widgets/status.go b/widgets/status.go index 8d0a1aec..d6d7761b 100644 --- a/widgets/status.go +++ b/widgets/status.go @@ -6,6 +6,7 @@ import ( "github.com/gdamore/tcell" "github.com/mattn/go-runewidth" + "git.sr.ht/~sircmpwn/aerc/config" "git.sr.ht/~sircmpwn/aerc/lib/ui" ) @@ -14,21 +15,21 @@ type StatusLine struct { stack []*StatusMessage fallback StatusMessage aerc *Aerc + uiConfig config.UIConfig } type StatusMessage struct { - bg tcell.Color - fg tcell.Color + style tcell.Style message string } -func NewStatusLine() *StatusLine { +func NewStatusLine(uiConfig config.UIConfig) *StatusLine { return &StatusLine{ fallback: StatusMessage{ - bg: tcell.ColorDefault, - fg: tcell.ColorDefault, + style: uiConfig.GetStyle(config.STYLE_STATUSLINE_DEFAULT), message: "Idle", }, + uiConfig: uiConfig, } } @@ -41,9 +42,7 @@ func (status *StatusLine) Draw(ctx *ui.Context) { if len(status.stack) != 0 { line = status.stack[len(status.stack)-1] } - style := tcell.StyleDefault. - Background(line.bg).Foreground(line.fg).Reverse(true) - ctx.Fill(0, 0, ctx.Width(), ctx.Height(), ' ', style) + ctx.Fill(0, 0, ctx.Width(), ctx.Height(), ' ', line.style) pendingKeys := "" if status.aerc != nil { for _, pendingKey := range status.aerc.pendingKeys { @@ -51,13 +50,21 @@ func (status *StatusLine) Draw(ctx *ui.Context) { } } message := runewidth.FillRight(line.message, ctx.Width()-len(pendingKeys)-5) - ctx.Printf(0, 0, style, "%s%s", message, pendingKeys) + ctx.Printf(0, 0, line.style, "%s%s", message, pendingKeys) } func (status *StatusLine) Set(text string) *StatusMessage { status.fallback = StatusMessage{ - bg: tcell.ColorDefault, - fg: tcell.ColorDefault, + style: status.uiConfig.GetStyle(config.STYLE_STATUSLINE_DEFAULT), + message: text, + } + status.Invalidate() + return &status.fallback +} + +func (status *StatusLine) SetError(text string) *StatusMessage { + status.fallback = StatusMessage{ + style: status.uiConfig.GetStyle(config.STYLE_STATUSLINE_ERROR), message: text, } status.Invalidate() @@ -66,8 +73,7 @@ func (status *StatusLine) Set(text string) *StatusMessage { func (status *StatusLine) Push(text string, expiry time.Duration) *StatusMessage { msg := &StatusMessage{ - bg: tcell.ColorDefault, - fg: tcell.ColorDefault, + style: status.uiConfig.GetStyle(config.STYLE_STATUSLINE_DEFAULT), message: text, } status.stack = append(status.stack, msg) @@ -84,6 +90,18 @@ func (status *StatusLine) Push(text string, expiry time.Duration) *StatusMessage return msg } +func (status *StatusLine) PushError(text string, expiry time.Duration) *StatusMessage { + msg := status.Push(text, expiry) + msg.Color(status.uiConfig.GetStyle(config.STYLE_STATUSLINE_ERROR)) + return msg +} + +func (status *StatusLine) PushSuccess(text string, expiry time.Duration) *StatusMessage { + msg := status.Push(text, expiry) + msg.Color(status.uiConfig.GetStyle(config.STYLE_STATUSLINE_SUCCESS)) + return msg +} + func (status *StatusLine) Expire() { status.stack = nil } @@ -92,7 +110,6 @@ func (status *StatusLine) SetAerc(aerc *Aerc) { status.aerc = aerc } -func (msg *StatusMessage) Color(bg tcell.Color, fg tcell.Color) { - msg.bg = bg - msg.fg = fg +func (msg *StatusMessage) Color(style tcell.Style) { + msg.style = style } |