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

Avoid overwriting mouse wheel scroll with selection auto-scroll

Browse source
This commit is contained in:
Julia 2024-01-22 18:12:25 -05:00
parent c5465d26f8
commit a2aa47aba2
3 changed files with 27 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

10
crates/editor/src/editor.rs
View file

@ -281,7 +281,7 @@ pub enum SelectPhase {
Update {
position: DisplayPoint,
goal_column: u32,
scroll_position: gpui::Point<f32>,
scroll_delta: gpui::Point<f32>,
},
End,
}
@ -1928,8 +1928,8 @@ impl Editor {
SelectPhase::Update {
position,
goal_column,
scroll_position,
} => self.update_selection(position, goal_column, scroll_position, cx),
scroll_delta,
} => self.update_selection(position, goal_column, scroll_delta, cx),
SelectPhase::End => self.end_selection(cx),
}
}
@ -2063,7 +2063,7 @@ impl Editor {
&mut self,
position: DisplayPoint,
goal_column: u32,
scroll_position: gpui::Point<f32>,
scroll_delta: gpui::Point<f32>,
cx: &mut ViewContext<Self>,
) {
let display_map = self.display_map.update(cx, |map, cx| map.snapshot(cx));
@ -2152,7 +2152,7 @@ impl Editor {
return;
}
self.set_scroll_position(scroll_position, cx);
self.apply_scroll_delta(scroll_delta, cx);
cx.notify();
}