tyiu/notedeck
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

reset virtual list if notes are spliced into timeline

Browse Source 
Calling egui_virtual_list's `items_inserted_at_start` is incorrect if we
insert notes inbetween other notes in the timeline. To prevent our list
getting confused, let's handle this case explicitly by calling 'reset'
when we splice notes in.

Ideally we would update egui_virtual_list to handle spliced-in items,
but we will leave that to a future update.
This commit is contained in:
William Casarin
2024-06-08 12:07:29 -05:00
parent 0eec8c8c2b
commit d576082297
2 changed files with 42 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

62
src/app.rs
View File

@@ -7,7 +7,7 @@ use crate::imgcache::ImageCache;
use crate::notecache::{CachedNote, NoteCache};
use crate::route::Route;
use crate::timeline;
use crate::timeline::{NoteRef, Timeline, ViewFilter};
use crate::timeline::{MergeKind, NoteRef, Timeline, ViewFilter};
use crate::ui;
use crate::ui::profile::SimpleProfilePreviewController;
use crate::ui::DesktopSidePanel;
@@ -381,24 +381,9 @@ fn poll_notes_for_timeline<'a>(
// ViewFilter::NotesAndReplies
{
let timeline = &mut damus.timelines[timeline_ind];
let prev_items = timeline.notes(ViewFilter::NotesAndReplies).len();
let refs: Vec<NoteRef> = new_refs.iter().map(|(_note, nr)| *nr).collect();
timeline.view_mut(ViewFilter::NotesAndReplies).notes =
timeline::merge_sorted_vecs(timeline.notes(ViewFilter::NotesAndReplies), &refs);
let new_items = timeline.notes(ViewFilter::NotesAndReplies).len() - prev_items;
// TODO: technically items could have been added inbetween
if new_items > 0 {
damus.timelines[timeline_ind]
.view(ViewFilter::NotesAndReplies)
.list
.borrow_mut()
.items_inserted_at_start(new_items);
}
insert_notes_into_timeline(damus, timeline_ind, ViewFilter::NotesAndReplies, &refs)
}
//
@@ -416,28 +401,37 @@ fn poll_notes_for_timeline<'a>(
}
}
let timeline = &mut damus.timelines[timeline_ind];
let prev_items = timeline.notes(ViewFilter::Notes).len();
timeline.view_mut(ViewFilter::Notes).notes =
timeline::merge_sorted_vecs(timeline.notes(ViewFilter::Notes), &filtered_refs);
let new_items = timeline.notes(ViewFilter::Notes).len() - prev_items;
// TODO: technically items could have been added inbetween
if new_items > 0 {
damus.timelines[timeline_ind]
.view(ViewFilter::Notes)
.list
.borrow_mut()
.items_inserted_at_start(new_items);
}
insert_notes_into_timeline(damus, timeline_ind, ViewFilter::Notes, &filtered_refs);
}
Ok(())
}
fn insert_notes_into_timeline(
app: &mut Damus,
timeline_ind: usize,
filter: ViewFilter,
new_refs: &[NoteRef],
) {
let timeline = &mut app.timelines[timeline_ind];
let num_prev_items = timeline.notes(filter).len();
let (notes, merge_kind) = timeline::merge_sorted_vecs(timeline.notes(filter), new_refs);
timeline.view_mut(filter).notes = notes;
let new_items = timeline.notes(filter).len() - num_prev_items;
// TODO: technically items could have been added inbetween
if new_items > 0 {
let mut list = app.timelines[timeline_ind].view(filter).list.borrow_mut();
match merge_kind {
// TODO: update egui_virtual_list to support spliced inserts
MergeKind::Spliced => list.reset(),
MergeKind::FrontInsert => list.items_inserted_at_start(new_items),
}
}
}
#[cfg(feature = "profiling")]
fn setup_profiling() {
puffin::set_scopes_on(true); // tell puffin to collect data