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

Don't render sample item twice in UniformList

Browse source
This commit is contained in:
Antonio Scandurra 2022-02-15 12:02:58 +01:00
parent 56e4591d6f
commit c33d554675
1 changed files with 26 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -162,7 +162,6 @@ where
"UniformList does not support being rendered with an unconstrained height" "UniformList does not support being rendered with an unconstrained height"
); );
} }
let mut items = Vec::new();
if self.item_count == 0 { if self.item_count == 0 {
return ( return (
@ -170,22 +169,27 @@ where
LayoutState { LayoutState {
item_height: 0., item_height: 0.,
scroll_max: 0., scroll_max: 0.,
items, items: Default::default(),
}, },
); );
} }
let mut items = Vec::new();
let mut size = constraint.max; let mut size = constraint.max;
let mut item_size; let mut item_size;
if let Some(sample_item_ix) = self.get_width_from_item { let sample_item_ix;
(self.append_items)(sample_item_ix..sample_item_ix + 1, &mut items, cx); let mut sample_item;
let sample_item = items.get_mut(0).unwrap(); if let Some(sample_ix) = self.get_width_from_item {
(self.append_items)(sample_ix..sample_ix + 1, &mut items, cx);
sample_item_ix = sample_ix;
sample_item = items.pop().unwrap();
item_size = sample_item.layout(constraint, cx); item_size = sample_item.layout(constraint, cx);
size.set_x(item_size.x()); size.set_x(item_size.x());
} else { } else {
(self.append_items)(0..1, &mut items, cx); (self.append_items)(0..1, &mut items, cx);
let first_item = items.first_mut().unwrap(); sample_item_ix = 0;
item_size = first_item.layout( sample_item = items.pop().unwrap();
item_size = sample_item.layout(
SizeConstraint::new( SizeConstraint::new(
vec2f(constraint.max.x(), 0.0), vec2f(constraint.max.x(), 0.0),
vec2f(constraint.max.x(), f32::INFINITY), vec2f(constraint.max.x(), f32::INFINITY),
@ -219,8 +223,21 @@ where
self.item_count, self.item_count,
start + (size.y() / item_height).ceil() as usize + 1, start + (size.y() / item_height).ceil() as usize + 1,
); );
items.clear();
(self.append_items)(start..end, &mut items, cx); if (start..end).contains(&sample_item_ix) {
if sample_item_ix > start {
(self.append_items)(start..sample_item_ix, &mut items, cx);
}
items.push(sample_item);
if sample_item_ix < end {
(self.append_items)(sample_item_ix + 1..end, &mut items, cx);
}
} else {
(self.append_items)(start..end, &mut items, cx);
}
for item in &mut items { for item in &mut items {
let item_size = item.layout(item_constraint, cx); let item_size = item.layout(item_constraint, cx);
if item_size.x() > size.x() { if item_size.x() > size.x() {