mirrors/zed
1
0
Fork 0
mirror of https://github.com/zed-industries/zed.git synced 2024-12-24 01:11:51 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Fix scrolling in List element

Browse source 
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
This commit is contained in:
Max Brunsfeld 2021-08-23 11:02:30 -07:00
parent a182db863f
commit d02eaf9e3a
1 changed files with 19 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -52,25 +52,6 @@ impl List {
pub fn new(state: ListState) -> Self { pub fn new(state: ListState) -> Self {
Self { state } Self { state }
} }
fn scroll(
&self,
_: Vector2F,
delta: Vector2F,
precise: bool,
scroll_max: f32,
cx: &mut EventContext,
) -> bool {
if !precise {
todo!("still need to handle non-precise scroll events from a mouse wheel");
}
let mut state = self.state.0.lock();
state.scroll_top = (state.scroll_top - delta.y()).max(0.0).min(scroll_max);
cx.notify();
true
}
} }
impl Element for List { impl Element for List {
@ -134,7 +115,7 @@ impl Element for List {
cursor.sum_start().0 cursor.sum_start().0
}; };
for element in &mut state.elements[visible_range] { for element in &mut state.elements[visible_range] {
let origin = bounds.origin() + vec2f(0., item_top) - state.scroll_top; let origin = bounds.origin() + vec2f(0., item_top - state.scroll_top);
element.paint(origin, cx); element.paint(origin, cx);
item_top += element.size().y(); item_top += element.size().y();
} }
@ -163,8 +144,7 @@ impl Element for List {
precise, precise,
} => { } => {
if bounds.contains_point(*position) { if bounds.contains_point(*position) {
let scroll_max = state.scroll_max(bounds.height()); if state.scroll(*position, *delta, *precise, bounds.height(), cx) {
if self.scroll(*position, *delta, *precise, scroll_max, cx) {
handled = true; handled = true;
} }
} }
@ -240,8 +220,23 @@ impl StateInner {
start_ix..end_ix + 1 start_ix..end_ix + 1
} }
fn scroll_max(&self, height: f32) -> f32 { fn scroll(
self.heights.summary().height - height &mut self,
_: Vector2F,
delta: Vector2F,
precise: bool,
height: f32,
cx: &mut EventContext,
) -> bool {
if !precise {
todo!("still need to handle non-precise scroll events from a mouse wheel");
}
let scroll_max = self.heights.summary().height - height;
self.scroll_top = (self.scroll_top - delta.y()).max(0.0).min(scroll_max);
cx.notify();
true
} }
} }