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

22
crates/editor/src/scroll.rs
View file

@ -327,6 +327,16 @@ impl Editor {
}
}
pub fn apply_scroll_delta(
&mut self,
scroll_delta: gpui::Point<f32>,
cx: &mut ViewContext<Self>,
) {
let display_map = self.display_map.update(cx, |map, cx| map.snapshot(cx));
let position = self.scroll_manager.anchor.scroll_position(&display_map) + scroll_delta;
self.set_scroll_position_taking_display_map(position, true, false, display_map, cx);
}
pub fn set_scroll_position(
&mut self,
scroll_position: gpui::Point<f32>,
@ -343,12 +353,22 @@ impl Editor {
cx: &mut ViewContext<Self>,
) {
let map = self.display_map.update(cx, |map, cx| map.snapshot(cx));
self.set_scroll_position_taking_display_map(scroll_position, local, autoscroll, map, cx);
}
fn set_scroll_position_taking_display_map(
&mut self,
scroll_position: gpui::Point<f32>,
local: bool,
autoscroll: bool,
display_map: DisplaySnapshot,
cx: &mut ViewContext<Self>,
) {
hide_hover(self, cx);
let workspace_id = self.workspace.as_ref().map(|workspace| workspace.1);
self.scroll_manager.set_scroll_position(
scroll_position,
&map,
&display_map,
local,
autoscroll,
workspace_id,