mirrors/zed
1
0
Fork 0
mirror of https://github.com/zed-industries/zed.git synced 2025-01-26 03:59:55 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Adjust the stored scroll top during layout if it exceeds scroll max

Browse source 
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
This commit is contained in:
Antonio Scandurra 2021-09-01 17:22:09 +02:00
parent 20e18ac3ad
commit 6e91289235
1 changed files with 40 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

63
gpui/src/elements/list.rs
View file

@ -110,7 +110,7 @@ impl Element for List {
let old_rendered_range = state.rendered_range.clone(); let old_rendered_range = state.rendered_range.clone();
let old_items = state.items.clone(); let old_items = state.items.clone();
let orientation = state.orientation; let orientation = state.orientation;
let stored_scroll_top = state.scroll_top; let mut stored_scroll_top = state.scroll_top;
let mut new_items = SumTree::new(); let mut new_items = SumTree::new();
let mut render_item = |ix, old_item: &ListItem| { let mut render_item = |ix, old_item: &ListItem| {
@ -130,7 +130,7 @@ impl Element for List {
// stored scroll can be used. // stored scroll can be used.
let mut new_rendered_start_ix; let mut new_rendered_start_ix;
let mut rendered_items = Vec::new(); let mut rendered_items = Vec::new();
let scroll_top; let mut scroll_top;
if let (Orientation::Bottom, None) = (orientation, stored_scroll_top) { if let (Orientation::Bottom, None) = (orientation, stored_scroll_top) {
let mut rendered_height = 0.; let mut rendered_height = 0.;
let mut cursor = old_items.cursor::<Count, ()>(); let mut cursor = old_items.cursor::<Count, ()>();
@ -167,37 +167,54 @@ impl Element for List {
new_rendered_start_ix = cursor.seek_start().0; new_rendered_start_ix = cursor.seek_start().0;
} else { } else {
scroll_top = stored_scroll_top.unwrap_or_default(); scroll_top = stored_scroll_top.unwrap_or_default();
new_rendered_start_ix = scroll_top.item_ix; let mut rendered_height = 0.;
let mut cursor = old_items.cursor::<Count, ()>(); let mut cursor = old_items.cursor::<Count, ()>();
cursor.seek(&Count(scroll_top.item_ix), Bias::Right, &()); cursor.seek(&Count(scroll_top.item_ix), Bias::Right, &());
cursor.prev(&()); for (ix, item) in cursor.by_ref().enumerate() {
let mut rendered_height = scroll_top.offset_in_item; if rendered_height >= scroll_top.offset_in_item + size.y() + overdraw {
while let Some(item) = cursor.item() {
if rendered_height >= overdraw {
break; break;
} }
let element = render_item(cursor.seek_start().0, item); let element = render_item(scroll_top.item_ix + ix, item);
rendered_height += element.size().y(); rendered_height += element.size().y();
rendered_items.push(ListItem::Rendered(element)); rendered_items.push(ListItem::Rendered(element));
}
rendered_items.reverse();
new_rendered_start_ix = scroll_top.item_ix;
cursor.seek(&Count(scroll_top.item_ix), Bias::Right, &());
cursor.prev(&());
let mut remaining_overdraw = overdraw - scroll_top.offset_in_item;
while let Some(item) = cursor.item() {
let element = render_item(cursor.seek_start().0, item);
if rendered_height < size.y() && rendered_height + element.size().y() >= size.y() {
let new_scroll_top = ScrollTop {
item_ix: cursor.seek_start().0,
offset_in_item: rendered_height + element.size().y() - size.y(),
};
stored_scroll_top = Some(new_scroll_top);
remaining_overdraw = overdraw + (size.y() - rendered_height);
} else if rendered_height >= size.y() && remaining_overdraw <= 0. {
break;
}
rendered_height += element.size().y();
remaining_overdraw -= element.size().y();
rendered_items.push(ListItem::Rendered(element));
new_rendered_start_ix -= 1; new_rendered_start_ix -= 1;
cursor.prev(&()); cursor.prev(&());
} }
rendered_items.reverse(); rendered_items.reverse();
let mut rendered_height = 0.; if rendered_height < size.y() {
cursor.seek(&Count(scroll_top.item_ix), Bias::Right, &()); stored_scroll_top = None;
for (ix, item) in cursor.enumerate() { scroll_top = match orientation {
if rendered_height >= size.y() + overdraw { Orientation::Top => Default::default(),
break; Orientation::Bottom => ScrollTop {
} item_ix: cursor.seek_start().0,
offset_in_item: rendered_height - size.y(),
let element = render_item(scroll_top.item_ix + ix, item); },
rendered_height += element.size().y(); };
if ix == 0 {
rendered_height -= scroll_top.offset_in_item;
}
rendered_items.push(ListItem::Rendered(element));
} }
} }
let new_rendered_range = let new_rendered_range =
@ -243,6 +260,7 @@ impl Element for List {
state.items = new_items; state.items = new_items;
state.rendered_range = new_rendered_range; state.rendered_range = new_rendered_range;
state.last_layout_width = Some(size.x()); state.last_layout_width = Some(size.x());
state.scroll_top = stored_scroll_top;
(size, scroll_top) (size, scroll_top)
} }
@ -662,12 +680,11 @@ mod tests {
assert_eq!(state.0.borrow().scroll_top(size.y()), 114.); assert_eq!(state.0.borrow().scroll_top(size.y()), 114.);
} }
#[crate::test(self, iterations = 10000, seed = 119)] #[crate::test(self, iterations = 10000)]
fn test_random(cx: &mut crate::MutableAppContext, mut rng: StdRng) { fn test_random(cx: &mut crate::MutableAppContext, mut rng: StdRng) {
let operations = env::var("OPERATIONS") let operations = env::var("OPERATIONS")
.map(|i| i.parse().expect("invalid `OPERATIONS` variable")) .map(|i| i.parse().expect("invalid `OPERATIONS` variable"))
.unwrap_or(10); .unwrap_or(10);
let operations = 3;
let mut presenter = cx.build_presenter(0, 0.); let mut presenter = cx.build_presenter(0, 0.);
let mut next_id = 0; let mut next_id = 0;