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

store: keep current message selected

Browse source 
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>
This commit is contained in:
Koni Marti 2022-04-16 00:22:20 +02:00 • committed by Robin Jarry
parent a34be9eb36
commit cb887a2d9d
4 changed files with 55 additions and 2 deletions

23
lib/msgstore.go
View file

@ -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