Yehowshua/ZIm
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Make the scroll position updated as soon as possible to the correct deferred value

Browse source 
Co-Authored-By: Antonio Scandurra <antonio@zed.dev>
This commit is contained in:
Kirill Bulatov 2024-01-10 12:16:06 +02:00
parent 927e0db750
commit f57ff1c660
1 changed files with 9 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

15
crates/gpui/src/elements/uniform_list.rs
View file

@ -95,6 +95,7 @@ impl UniformListScrollHandle {
} else if item_bottom > scroll_top + state.list_height {
scroll_offset.y = -(item_bottom - state.list_height);
}
self.deferred_scroll_to_item = None;
} else {
self.deferred_scroll_to_item = Some(ix);
}
@ -104,7 +105,6 @@ impl UniformListScrollHandle {
if let Some(state) = &*self.state.borrow() {
-state.scroll_offset.borrow().y
} else {
self.deferred_scroll_to_item = Some(0);
Pixels::ZERO
}
}
@ -241,12 +241,15 @@ impl Element for UniformList {
scroll_handle.state.borrow_mut().replace(ScrollHandleState {
item_height,
list_height: padded_bounds.size.height,
scroll_offset: shared_scroll_offset,
scroll_offset: shared_scroll_offset.clone(),
});
if let Some(ix) = scroll_handle.deferred_scroll_to_item.take() {
dbg!("@@@@");
scroll_handle.scroll_to_item(ix);
cx.notify();
if let Some(scroll_handle) = self.scroll_handle.as_mut() {
if scroll_handle.state.borrow().is_some() {
if let Some(ix) = scroll_handle.deferred_scroll_to_item.take() {
scroll_handle.scroll_to_item(ix);
scroll_offset = *shared_scroll_offset.borrow();
}
}
}
}