mirror of
https://github.com/zed-industries/zed.git
synced 2024-09-20 10:57:22 +03:00
Maintain scroll position in CollabPanel
after updating entries (#3712)
Release Notes: - N/A
This commit is contained in:
commit
cc107f72f8
@ -962,15 +962,12 @@ impl CollabPanel {
|
|||||||
self.entries.push(ListEntry::ContactPlaceholder);
|
self.entries.push(ListEntry::ContactPlaceholder);
|
||||||
}
|
}
|
||||||
|
|
||||||
self.list_state.reset(self.entries.len());
|
|
||||||
|
|
||||||
if select_same_item {
|
if select_same_item {
|
||||||
if let Some(prev_selected_entry) = prev_selected_entry {
|
if let Some(prev_selected_entry) = prev_selected_entry {
|
||||||
self.selection.take();
|
self.selection.take();
|
||||||
for (ix, entry) in self.entries.iter().enumerate() {
|
for (ix, entry) in self.entries.iter().enumerate() {
|
||||||
if *entry == prev_selected_entry {
|
if *entry == prev_selected_entry {
|
||||||
self.selection = Some(ix);
|
self.selection = Some(ix);
|
||||||
self.scroll_to_item(ix);
|
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -980,49 +977,53 @@ impl CollabPanel {
|
|||||||
if self.entries.is_empty() {
|
if self.entries.is_empty() {
|
||||||
None
|
None
|
||||||
} else {
|
} else {
|
||||||
let ix = prev_selection.min(self.entries.len() - 1);
|
Some(prev_selection.min(self.entries.len() - 1))
|
||||||
self.scroll_to_item(ix);
|
|
||||||
Some(ix)
|
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
let old_scroll_top = self.list_state.logical_scroll_top();
|
||||||
|
self.list_state.reset(self.entries.len());
|
||||||
|
|
||||||
if scroll_to_top {
|
if scroll_to_top {
|
||||||
self.scroll_to_item(0)
|
self.list_state.scroll_to(ListOffset::default());
|
||||||
} else {
|
} else {
|
||||||
let ListOffset {
|
|
||||||
item_ix: old_index,
|
|
||||||
offset_in_item: old_offset,
|
|
||||||
} = self.list_state.logical_scroll_top();
|
|
||||||
// Attempt to maintain the same scroll position.
|
// Attempt to maintain the same scroll position.
|
||||||
if let Some(old_top_entry) = old_entries.get(old_index) {
|
if let Some(old_top_entry) = old_entries.get(old_scroll_top.item_ix) {
|
||||||
let (new_index, new_offset) = self
|
let new_scroll_top = self
|
||||||
.entries
|
.entries
|
||||||
.iter()
|
.iter()
|
||||||
.position(|entry| entry == old_top_entry)
|
.position(|entry| entry == old_top_entry)
|
||||||
.map(|item_ix| (item_ix, old_offset))
|
.map(|item_ix| ListOffset {
|
||||||
|
item_ix,
|
||||||
|
offset_in_item: old_scroll_top.offset_in_item,
|
||||||
|
})
|
||||||
.or_else(|| {
|
.or_else(|| {
|
||||||
let entry_after_old_top = old_entries.get(old_index + 1)?;
|
let entry_after_old_top = old_entries.get(old_scroll_top.item_ix + 1)?;
|
||||||
let item_ix = self
|
let item_ix = self
|
||||||
.entries
|
.entries
|
||||||
.iter()
|
.iter()
|
||||||
.position(|entry| entry == entry_after_old_top)?;
|
.position(|entry| entry == entry_after_old_top)?;
|
||||||
Some((item_ix, px(0.)))
|
Some(ListOffset {
|
||||||
|
item_ix,
|
||||||
|
offset_in_item: Pixels::ZERO,
|
||||||
|
})
|
||||||
})
|
})
|
||||||
.or_else(|| {
|
.or_else(|| {
|
||||||
let entry_before_old_top = old_entries.get(old_index.saturating_sub(1))?;
|
let entry_before_old_top =
|
||||||
|
old_entries.get(old_scroll_top.item_ix.saturating_sub(1))?;
|
||||||
let item_ix = self
|
let item_ix = self
|
||||||
.entries
|
.entries
|
||||||
.iter()
|
.iter()
|
||||||
.position(|entry| entry == entry_before_old_top)?;
|
.position(|entry| entry == entry_before_old_top)?;
|
||||||
Some((item_ix, px(0.)))
|
Some(ListOffset {
|
||||||
})
|
item_ix,
|
||||||
.unwrap_or_else(|| (old_index, old_offset));
|
offset_in_item: Pixels::ZERO,
|
||||||
|
})
|
||||||
|
});
|
||||||
|
|
||||||
self.list_state.scroll_to(ListOffset {
|
self.list_state
|
||||||
item_ix: new_index,
|
.scroll_to(new_scroll_top.unwrap_or(old_scroll_top));
|
||||||
offset_in_item: new_offset,
|
|
||||||
});
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -293,7 +293,7 @@ impl std::fmt::Debug for ListItem {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
#[derive(Debug, Clone, Copy)]
|
#[derive(Debug, Clone, Copy, Default)]
|
||||||
pub struct ListOffset {
|
pub struct ListOffset {
|
||||||
pub item_ix: usize,
|
pub item_ix: usize,
|
||||||
pub offset_in_item: Pixels,
|
pub offset_in_item: Pixels,
|
||||||
|
Loading…
Reference in New Issue
Block a user