blacklight/aerc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Allow custom spinner via config file

Browse source 
Allows to set `ui.spinner=` to a string which is then split by
`ui.spinner-delimiter=` (Default: comma) instead of having a hard coded
animation.

This implementation doesn't use INIs capabilities to split strings as
it trims whitespaces breaking the default animation.

Signed-off-by: Paul Spooren <mail@aparcar.org>
This commit is contained in:
Paul Spooren 2019-08-29 15:30:35 -10:00 • committed by Drew DeVault
parent f13f9a8684
commit e4104a8674
5 changed files with 32 additions and 21 deletions
widgets
spinner.go

29
widgets/spinner.go
View file

@ -3,35 +3,26 @@ package widgets
import (
"sync/atomic"
"time"
"strings"
"github.com/gdamore/tcell"
"git.sr.ht/~sircmpwn/aerc/config"
"git.sr.ht/~sircmpwn/aerc/lib/ui"
)
var (
frames = []string{
"[..] ",
" [..] ",
" [..] ",
" [..] ",
" [..]",
" [..] ",
" [..] ",
" [..] ",
}
)
type Spinner struct {
ui.Invalidatable
frame int64 // access via atomic
frames []string
stop chan struct{}
}
func NewSpinner() *Spinner {
func NewSpinner(uiConf *config.UIConfig) *Spinner {
spinner := Spinner{
stop: make(chan struct{}),
frame: -1,
stop: make(chan struct{}),
frame: -1,
frames: strings.Split(uiConf.Spinner, uiConf.SpinnerDelimiter),
}
return &spinner
}
@ -77,11 +68,11 @@ func (s *Spinner) Draw(ctx *ui.Context) {
s.Start()
}
cur := int(atomic.LoadInt64(&s.frame) % int64(len(frames)))
cur := int(atomic.LoadInt64(&s.frame) % int64(len(s.frames)))
ctx.Fill(0, 0, ctx.Width(), ctx.Height(), ' ', tcell.StyleDefault)
col := ctx.Width()/2 - len(frames[0])/2 + 1
ctx.Printf(col, 0, tcell.StyleDefault, "%s", frames[cur])
col := ctx.Width()/2 - len(s.frames[0])/2 + 1
ctx.Printf(col, 0, tcell.StyleDefault, "%s", s.frames[cur])
}
func (s *Spinner) Invalidate() {