aerc

Working clone of aerc-mail.org
git clone git://git.danielmoch.com/aerc.git
Log | Files | Refs | README | LICENSE

commit cf664620005cf65d060e689fbb27b939dd3192a7
parent 257affcd4841b8f595a4a13cdb0fd2a1a2dd0faa
Author: Drew DeVault <sir@cmpwn.com>
Date:   Sun, 13 Jan 2019 15:32:52 -0500

Simplify approach to directory list

This doesn't really need to be abstract tbh

Diffstat:
Mwidgets/account.go | 22+++++++++++++++++-----
Mwidgets/directories.go | 21++++++++++++++++++---
2 files changed, 35 insertions(+), 8 deletions(-)

diff --git a/widgets/account.go b/widgets/account.go @@ -122,13 +122,25 @@ func (acct *AccountView) Event(event tcell.Event) bool { func (acct *AccountView) connected(msg types.WorkerMessage) { switch msg := msg.(type) { case *types.Done: - acct.statusline.Set("Connected.") - acct.logger.Println("Connected.") - acct.dirlist.UpdateList() + acct.statusline.Set("Listing mailboxes...") + acct.logger.Println("Listing mailboxes...") + acct.dirlist.UpdateList(func(dirs []string) { + var dir string + for _, _dir := range dirs { + if _dir == "INBOX" { + dir = _dir + break + } + } + if dir == "" { + dir = dirs[0] + } + acct.dirlist.Select(dir) + acct.logger.Println("Connected.") + acct.statusline.Set("Connected.") + }) case *types.CertificateApprovalRequest: // TODO: Ask the user - acct.logger.Println("Approved unknown certificate.") - acct.statusline.Push("Approved unknown certificate.", 5*time.Second) acct.worker.PostAction(&types.ApproveCertificate{ Message: types.RespondTo(msg), Approved: true, diff --git a/widgets/directories.go b/widgets/directories.go @@ -16,6 +16,7 @@ type DirectoryList struct { dirs []string logger *log.Logger onInvalidate func(d ui.Drawable) + selected string worker *types.Worker } @@ -25,7 +26,7 @@ func NewDirectoryList(conf *config.AccountConfig, return &DirectoryList{conf: conf, logger: logger, worker: worker} } -func (dirlist *DirectoryList) UpdateList() { +func (dirlist *DirectoryList) UpdateList(done func(dirs []string)) { var dirs []string dirlist.worker.PostAction( &types.ListDirectories{}, func(msg types.WorkerMessage) { @@ -37,10 +38,18 @@ func (dirlist *DirectoryList) UpdateList() { sort.Strings(dirs) dirlist.dirs = dirs dirlist.Invalidate() + if done != nil { + done(dirs) + } } }) } +func (dirlist *DirectoryList) Select(name string) { + dirlist.selected = name + dirlist.Invalidate() +} + func (dirlist *DirectoryList) OnInvalidate(onInvalidate func(d ui.Drawable)) { dirlist.onInvalidate = onInvalidate } @@ -58,14 +67,20 @@ func (dirlist *DirectoryList) Draw(ctx *ui.Context) { if row >= ctx.Height() { break } - if len(dirlist.conf.Folders) > 1 { + if len(dirlist.conf.Folders) > 1 && name != dirlist.selected { idx := sort.SearchStrings(dirlist.conf.Folders, name) if idx == len(dirlist.conf.Folders) || dirlist.conf.Folders[idx] != name { continue } } - ctx.Printf(0, row, tcell.StyleDefault, "%s", name) + style := tcell.StyleDefault + if name == dirlist.selected { + style = style.Background(tcell.ColorWhite). + Foreground(tcell.ColorBlack) + } + ctx.Fill(0, row, ctx.Width(), 1, ' ', style) + ctx.Printf(0, row, style, "%s", name) row++ } }