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

set scroll offset when routing to thread

Browse Source 
Signed-off-by: kernelkind <kernelkind@gmail.com>
This commit is contained in:
kernelkind
2025-08-04 16:09:27 -04:00
parent 97d15e41e7
commit e8be471608
3 changed files with 27 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
crates/notedeck_columns/src/actionbar.rs
View File

@@ -93,7 +93,15 @@ fn execute_note_action(
}; };
timeline_res = threads timeline_res = threads
.open(ndb, txn, pool, &thread_selection, preview, col) .open(
ndb,
txn,
pool,
&thread_selection,
preview,
col,
scroll_offset,
)
.map(NotesOpenResult::Thread); .map(NotesOpenResult::Thread);
let route = Route::Thread(thread_selection); let route = Route::Thread(thread_selection);

4
crates/notedeck_columns/src/timeline/thread.rs
View File

@@ -154,6 +154,7 @@ pub struct Threads {
impl Threads { impl Threads {
/// Opening a thread. /// Opening a thread.
/// Similar to [[super::cache::TimelineCache::open]] /// Similar to [[super::cache::TimelineCache::open]]
#[allow(clippy::too_many_arguments)]
pub fn open( pub fn open(
&mut self, &mut self,
ndb: &mut Ndb, ndb: &mut Ndb,
@@ -162,6 +163,7 @@ impl Threads {
thread: &ThreadSelection, thread: &ThreadSelection,
new_scope: bool, new_scope: bool,
col: usize, col: usize,
scroll_offset: f32,
) -> Option<NewThreadNotes> { ) -> Option<NewThreadNotes> {
tracing::info!("Opening thread: {:?}", thread); tracing::info!("Opening thread: {:?}", thread);
let local_sub_filter = if let Some(selected) = &thread.selected_note { let local_sub_filter = if let Some(selected) = &thread.selected_note {
@@ -191,7 +193,7 @@ impl Threads {
RawEntryMut::Vacant(entry) => { RawEntryMut::Vacant(entry) => {
let id = NoteId::new(*selected_note_id); let id = NoteId::new(*selected_note_id);
let node = ThreadNode::new(ParentState::Unknown); let node = ThreadNode::new(ParentState::Unknown).with_offset(scroll_offset);
entry.insert(id, node); entry.insert(id, node);
&local_sub_filter &local_sub_filter

21
crates/notedeck_columns/src/ui/thread.rs
View File

@@ -52,17 +52,26 @@ impl<'a, 'd> ThreadView<'a, 'd> {
.auto_shrink([false, false]) .auto_shrink([false, false])
.scroll_bar_visibility(egui::scroll_area::ScrollBarVisibility::AlwaysVisible); .scroll_bar_visibility(egui::scroll_area::ScrollBarVisibility::AlwaysVisible);
let offset_id = scroll_id.with(("scroll_offset", self.selected_note_id)); if let Some(thread) = self.threads.threads.get_mut(&self.selected_note_id) {
if let Some(new_offset) = thread.set_scroll_offset.take() {
if let Some(offset) = ui.data(|i| i.get_temp::<f32>(offset_id)) { scroll_area = scroll_area.vertical_scroll_offset(new_offset);
scroll_area = scroll_area.vertical_scroll_offset(offset); }
} }
let output = scroll_area.show(ui, |ui| self.notes(ui, &txn)); let output = scroll_area.show(ui, |ui| self.notes(ui, &txn));
ui.data_mut(|d| d.insert_temp(offset_id, output.state.offset.y)); let mut resp = output.inner;
output.inner if let Some(NoteAction::Note {
note_id: _,
preview: _,
scroll_offset,
}) = &mut resp
{
*scroll_offset = output.state.offset.y;
}
resp
} }
fn notes(&mut self, ui: &mut egui::Ui, txn: &Transaction) -> Option<NoteAction> { fn notes(&mut self, ui: &mut egui::Ui, txn: &Transaction) -> Option<NoteAction> {