diff options
author | Koni Marti <koni.marti@gmail.com> | 2022-04-16 00:22:20 +0200 |
---|---|---|
committer | Robin Jarry <robin@jarry.cc> | 2022-04-17 12:18:33 +0200 |
commit | cb887a2d9d7d7cd5eb57d8849df40cecc3b90090 (patch) | |
tree | b7b23c34a772048484ed6e645226ff64fe103d64 /lib | |
parent | a34be9eb36d26afdd723146673694db70662429c (diff) | |
download | aerc-cb887a2d9d7d7cd5eb57d8849df40cecc3b90090.tar.gz |
store: keep current message selected
Keep current message selected when clearing or changing filters and when
toggling threads.
Add -s flag to the clear command to also clear the selected message and
set cursor to the top of the message list.
Implements: https://todo.sr.ht/~rjarry/aerc/36
Signed-off-by: Koni Marti <koni.marti@gmail.com>
Acked-by: Robin Jarry <robin@jarry.cc>
Diffstat (limited to 'lib')
-rw-r--r-- | lib/msgstore.go | 23 |
1 files changed, 22 insertions, 1 deletions
diff --git a/lib/msgstore.go b/lib/msgstore.go index bd8d54d5..a5c0e8f5 100644 --- a/lib/msgstore.go +++ b/lib/msgstore.go @@ -472,7 +472,12 @@ func (store *MessageStore) Uids() []uint32 { } func (store *MessageStore) Selected() *models.MessageInfo { - return store.Messages[store.Uids()[len(store.Uids())-store.selected-1]] + uids := store.Uids() + idx := len(uids) - store.selected - 1 + if len(uids) == 0 || idx < 0 || idx >= len(uids) { + return nil + } + return store.Messages[uids[idx]] } func (store *MessageStore) SelectedIndex() int { @@ -490,6 +495,21 @@ func (store *MessageStore) Select(index int) { store.updateVisual() } +func (store *MessageStore) Reselect(info *models.MessageInfo) { + if info == nil { + return + } + uid := info.Uid + newIdx := 0 + for idx, uidStore := range store.Uids() { + if uidStore == uid { + newIdx = len(store.Uids()) - idx - 1 + break + } + } + store.Select(newIdx) +} + // Mark sets the marked state on a MessageInfo func (store *MessageStore) Mark(uid uint32) { if store.visualMarkMode { @@ -660,6 +680,7 @@ func (store *MessageStore) ApplySearch(results []uint32) { } func (store *MessageStore) ApplyFilter(results []uint32) { + defer store.Reselect(store.Selected()) store.results = nil store.filtered = results store.filter = true |