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

enforce scroll_id for ThreadView

Browse Source 
Signed-off-by: kernelkind <kernelkind@gmail.com>
This commit is contained in:
kernelkind
2025-07-24 09:42:46 -06:00
parent 0bc32272d2
commit 6db6cf7b7a
2 changed files with 8 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
crates/notedeck_columns/src/timeline/route.rs
View File

@@ -87,8 +87,8 @@ pub fn render_thread_route(
note_options, note_options,
note_context, note_context,
jobs, jobs,
col,
) )
.id_source(col)
.ui(ui) .ui(ui)
.map(Into::into) .map(Into::into)
} }

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

@@ -14,7 +14,6 @@ pub struct ThreadView<'a, 'd> {
selected_note_id: &'a [u8; 32], selected_note_id: &'a [u8; 32],
note_options: NoteOptions, note_options: NoteOptions,
col: usize, col: usize,
id_source: egui::Id,
note_context: &'a mut NoteContext<'d>, note_context: &'a mut NoteContext<'d>,
jobs: &'a mut JobsCache, jobs: &'a mut JobsCache,
} }
@@ -27,37 +26,33 @@ impl<'a, 'd> ThreadView<'a, 'd> {
note_options: NoteOptions, note_options: NoteOptions,
note_context: &'a mut NoteContext<'d>, note_context: &'a mut NoteContext<'d>,
jobs: &'a mut JobsCache, jobs: &'a mut JobsCache,
col: usize,
) -> Self { ) -> Self {
let id_source = egui::Id::new("threadscroll_threadview");
ThreadView { ThreadView {
threads, threads,
selected_note_id, selected_note_id,
note_options, note_options,
id_source,
note_context, note_context,
jobs, jobs,
col: 0, col,
} }
} }
pub fn id_source(mut self, col: usize) -> Self { pub fn scroll_id(selected_note_id: &[u8; 32], col: usize) -> egui::Id {
self.col = col; egui::Id::new(("threadscroll", selected_note_id, col))
self.id_source = egui::Id::new(("threadscroll", col));
self
} }
pub fn ui(&mut self, ui: &mut egui::Ui) -> Option<NoteAction> { pub fn ui(&mut self, ui: &mut egui::Ui) -> Option<NoteAction> {
let txn = Transaction::new(self.note_context.ndb).expect("txn"); let txn = Transaction::new(self.note_context.ndb).expect("txn");
let scroll_id = ThreadView::scroll_id(self.selected_note_id, self.col);
let mut scroll_area = egui::ScrollArea::vertical() let mut scroll_area = egui::ScrollArea::vertical()
.id_salt(self.id_source) .id_salt(scroll_id)
.animated(false) .animated(false)
.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 = self let offset_id = scroll_id.with(("scroll_offset", self.selected_note_id));
.id_source
.with(("scroll_offset", self.selected_note_id));
if let Some(offset) = ui.data(|i| i.get_temp::<f32>(offset_id)) { if let Some(offset) = ui.data(|i| i.get_temp::<f32>(offset_id)) {
scroll_area = scroll_area.vertical_scroll_offset(offset); scroll_area = scroll_area.vertical_scroll_offset(offset);