mirrors/zed
1
0
Fork 0
mirror of https://github.com/zed-industries/zed.git synced 2025-02-06 10:42:08 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

Don't scroll beyond end of uniform list

Browse source
This commit is contained in:
Conrad Irwin 2023-12-15 12:54:12 -07:00
parent a65688abac
commit a35fdf45fc
1 changed files with 8 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
crates/gpui2/src/elements/uniform_list.rs
View file

@ -191,7 +191,7 @@ impl Element for UniformList {
content_size, content_size,
&mut element_state.interactive, &mut element_state.interactive,
cx, cx,
|style, scroll_offset, cx| { |style, mut scroll_offset, cx| {
let border = style.border_widths.to_pixels(cx.rem_size()); let border = style.border_widths.to_pixels(cx.rem_size());
let padding = style.padding.to_pixels(bounds.size.into(), cx.rem_size()); let padding = style.padding.to_pixels(bounds.size.into(), cx.rem_size());
@ -204,6 +204,13 @@ impl Element for UniformList {
cx.with_z_index(style.z_index.unwrap_or(0), |cx| { cx.with_z_index(style.z_index.unwrap_or(0), |cx| {
style.paint(bounds, cx, |cx| { style.paint(bounds, cx, |cx| {
if self.item_count > 0 { if self.item_count > 0 {
let min_scroll_offset =
padded_bounds.size.height - (item_height * self.item_count);
if scroll_offset.y < min_scroll_offset {
shared_scroll_offset.borrow_mut().y = min_scroll_offset;
scroll_offset.y = min_scroll_offset;
}
if let Some(scroll_handle) = self.scroll_handle.clone() { if let Some(scroll_handle) = self.scroll_handle.clone() {
scroll_handle.0.borrow_mut().replace(ScrollHandleState { scroll_handle.0.borrow_mut().replace(ScrollHandleState {
item_height, item_height,