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

Don't scroll editors away from the top of their buffer when content changes

Browse source 
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
This commit is contained in:
Max Brunsfeld 2022-01-05 12:31:00 -08:00
parent 85a13fa477
commit 5a53eeef63
1 changed files with 26 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -365,7 +365,7 @@ pub struct Editor {
select_larger_syntax_node_stack: Vec<Box<[Selection<usize>]>>, select_larger_syntax_node_stack: Vec<Box<[Selection<usize>]>>,
active_diagnostics: Option<ActiveDiagnosticGroup>, active_diagnostics: Option<ActiveDiagnosticGroup>,
scroll_position: Vector2F, scroll_position: Vector2F,
scroll_top_anchor: Anchor, scroll_top_anchor: Option<Anchor>,
autoscroll_request: Option<Autoscroll>, autoscroll_request: Option<Autoscroll>,
build_settings: BuildSettings, build_settings: BuildSettings,
focused: bool, focused: bool,
@ -383,7 +383,7 @@ pub struct EditorSnapshot {
pub placeholder_text: Option<Arc<str>>, pub placeholder_text: Option<Arc<str>>,
is_focused: bool, is_focused: bool,
scroll_position: Vector2F, scroll_position: Vector2F,
scroll_top_anchor: Anchor, scroll_top_anchor: Option<Anchor>,
} }
struct PendingSelection { struct PendingSelection {
@ -495,7 +495,7 @@ impl Editor {
active_diagnostics: None, active_diagnostics: None,
build_settings, build_settings,
scroll_position: Vector2F::zero(), scroll_position: Vector2F::zero(),
scroll_top_anchor: Anchor::min(), scroll_top_anchor: None,
autoscroll_request: None, autoscroll_request: None,
focused: false, focused: false,
show_local_cursors: false, show_local_cursors: false,
@ -565,15 +565,22 @@ impl Editor {
pub 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 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); if scroll_position.y() == 0. {
self.scroll_top_anchor = map self.scroll_top_anchor = None;
.buffer_snapshot self.scroll_position = scroll_position;
.anchor_at(scroll_top_buffer_offset, Bias::Right); } else {
self.scroll_position = vec2f( let scroll_top_buffer_offset =
scroll_position.x(), DisplayPoint::new(scroll_position.y() as u32, 0).to_offset(&map, Bias::Right);
scroll_position.y() - self.scroll_top_anchor.to_display_point(&map).row() as f32, let anchor = map
); .buffer_snapshot
.anchor_at(scroll_top_buffer_offset, Bias::Right);
self.scroll_position = vec2f(
scroll_position.x(),
scroll_position.y() - anchor.to_display_point(&map).row() as f32,
);
self.scroll_top_anchor = Some(anchor);
}
cx.notify(); cx.notify();
} }
@ -3631,10 +3638,14 @@ impl EditorSettings {
fn compute_scroll_position( fn compute_scroll_position(
snapshot: &DisplaySnapshot, snapshot: &DisplaySnapshot,
mut scroll_position: Vector2F, mut scroll_position: Vector2F,
scroll_top_anchor: &Anchor, scroll_top_anchor: &Option<Anchor>,
) -> Vector2F { ) -> Vector2F {
let scroll_top = scroll_top_anchor.to_display_point(snapshot).row() as f32; if let Some(anchor) = scroll_top_anchor {
scroll_position.set_y(scroll_top + scroll_position.y()); let scroll_top = anchor.to_display_point(snapshot).row() as f32;
scroll_position.set_y(scroll_top + scroll_position.y());
} else {
scroll_position.set_y(0.);
}
scroll_position scroll_position
} }