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

Restore scroll position and selections when cancelling go-to-line

Browse source 
But preserve the line when confirming.
This commit is contained in:
Nathan Sobo 2021-11-24 15:43:48 -07:00
parent 8c0541b455
commit 1e49b56626
2 changed files with 39 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

9
crates/editor/src/lib.rs
View file

@ -534,7 +534,7 @@ impl Editor {
cx.notify();
}
fn set_scroll_position(&mut self, scroll_position: Vector2F, cx: &mut ViewContext<Self>) {
pub fn set_scroll_position(&mut self, scroll_position: Vector2F, cx: &mut ViewContext<Self>) {
let map = self.display_map.update(cx, |map, cx| map.snapshot(cx));
let scroll_top_buffer_offset =
DisplayPoint::new(scroll_position.y() as u32, 0).to_offset(&map, Bias::Right);
@ -555,6 +555,11 @@ impl Editor {
cx.notify();
}
pub fn scroll_position(&self, cx: &mut ViewContext<Self>) -> Vector2F {
let display_map = self.display_map.update(cx, |map, cx| map.snapshot(cx));
compute_scroll_position(&display_map, self.scroll_position, &self.scroll_top_anchor)
}
pub fn clamp_scroll_left(&mut self, max: f32) -> bool {
if max < self.scroll_position.x() {
self.scroll_position.set_x(max);
@ -3029,7 +3034,7 @@ impl Editor {
.unwrap()
}
fn update_selections<T>(
pub fn update_selections<T>(
&mut self,
mut selections: Vec<Selection<T>>,
autoscroll: Option<Autoscroll>,