diff options
Diffstat (limited to 'widgets')
| -rw-r--r-- | widgets/account.go | 5 | ||||
| -rw-r--r-- | widgets/directories.go | 18 |
2 files changed, 21 insertions, 2 deletions
diff --git a/widgets/account.go b/widgets/account.go index 5747f4b8..d22b1c64 100644 --- a/widgets/account.go +++ b/widgets/account.go @@ -90,6 +90,10 @@ func NewAccountView(conf *config.AccountConfig, return acct } +func (acct *AccountView) Name() string { + return acct.conf.Name +} + func (acct *AccountView) Children() []ui.Drawable { return acct.grid.Children() } @@ -173,6 +177,7 @@ func (acct *AccountView) onMessage(msg types.WorkerMessage) { case *types.Done: switch msg.InResponseTo().(type) { case *types.OpenDirectory: + acct.msglist.SetStore(nil) acct.worker.PostAction(&types.FetchDirectoryContents{}, func(msg types.WorkerMessage) { store := acct.msgStores[acct.dirlist.selected] diff --git a/widgets/directories.go b/widgets/directories.go index ae31d297..d66ae1f5 100644 --- 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) + selecting string selected string spinner *Spinner worker *types.Worker @@ -58,11 +59,24 @@ func (dirlist *DirectoryList) UpdateList(done func(dirs []string)) { } func (dirlist *DirectoryList) Select(name string) { - dirlist.selected = name - dirlist.worker.PostAction(&types.OpenDirectory{Directory: name}, nil) + dirlist.selecting = name + dirlist.worker.PostAction(&types.OpenDirectory{Directory: name}, + func(msg types.WorkerMessage) { + switch msg.(type) { + case *types.Error: + dirlist.selecting = "" + default: + dirlist.selected = dirlist.selecting + } + dirlist.Invalidate() + }) dirlist.Invalidate() } +func (dirlist *DirectoryList) Selected() string { + return dirlist.selected +} + func (dirlist *DirectoryList) OnInvalidate(onInvalidate func(d ui.Drawable)) { dirlist.onInvalidate = onInvalidate } |