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

editor: Fix scrolling stuttering at the top of multibuffers (#34295)

Browse source 
Release Notes:

- Fixed an issue where scrolling would stutter at the top of
multibuffers.
This commit is contained in:
Finn Evers 2025-07-11 19:10:39 +02:00 • committed by GitHub
parent d0e01dbd8f
commit af71e15ea0
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 38 additions and 69 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -216,80 +216,49 @@ impl ScrollManager {
window: &mut Window, window: &mut Window,
cx: &mut Context<Editor>, cx: &mut Context<Editor>,
) { ) {
let (new_anchor, top_row) = if scroll_position.y <= 0. && scroll_position.x <= 0. { let scroll_top = scroll_position.y.max(0.);
( let scroll_top = match EditorSettings::get_global(cx).scroll_beyond_last_line {
ScrollAnchor { ScrollBeyondLastLine::OnePage => scroll_top,
anchor: Anchor::min(), ScrollBeyondLastLine::Off => {
offset: scroll_position.max(&gpui::Point::default()), if let Some(height_in_lines) = self.visible_line_count {
}, let max_row = map.max_point().row().0 as f32;
0, scroll_top.min(max_row - height_in_lines + 1.).max(0.)
) } else {
} else if scroll_position.y <= 0. { scroll_top
let buffer_point = map
.clip_point(
DisplayPoint::new(DisplayRow(0), scroll_position.x as u32),
Bias::Left,
)
.to_point(map);
let anchor = map.buffer_snapshot.anchor_at(buffer_point, Bias::Right);
(
ScrollAnchor {
anchor: anchor,
offset: scroll_position.max(&gpui::Point::default()),
},
0,
)
} else {
let scroll_top = scroll_position.y;
let scroll_top = match EditorSettings::get_global(cx).scroll_beyond_last_line {
ScrollBeyondLastLine::OnePage => scroll_top,
ScrollBeyondLastLine::Off => {
if let Some(height_in_lines) = self.visible_line_count {
let max_row = map.max_point().row().0 as f32;
scroll_top.min(max_row - height_in_lines + 1.).max(0.)
} else {
scroll_top
}
} }
ScrollBeyondLastLine::VerticalScrollMargin => { }
if let Some(height_in_lines) = self.visible_line_count { ScrollBeyondLastLine::VerticalScrollMargin => {
let max_row = map.max_point().row().0 as f32; if let Some(height_in_lines) = self.visible_line_count {
scroll_top let max_row = map.max_point().row().0 as f32;
.min(max_row - height_in_lines + 1. + self.vertical_scroll_margin) scroll_top
.max(0.) .min(max_row - height_in_lines + 1. + self.vertical_scroll_margin)
} else { .max(0.)
scroll_top } else {
} scroll_top
} }
}; }
let scroll_top_row = DisplayRow(scroll_top as u32);
let scroll_top_buffer_point = map
.clip_point(
DisplayPoint::new(scroll_top_row, scroll_position.x as u32),
Bias::Left,
)
.to_point(map);
let top_anchor = map
.buffer_snapshot
.anchor_at(scroll_top_buffer_point, Bias::Right);
(
ScrollAnchor {
anchor: top_anchor,
offset: point(
scroll_position.x.max(0.),
scroll_top - top_anchor.to_display_point(map).row().as_f32(),
),
},
scroll_top_buffer_point.row,
)
}; };
let scroll_top_row = DisplayRow(scroll_top as u32);
let scroll_top_buffer_point = map
.clip_point(
DisplayPoint::new(scroll_top_row, scroll_position.x as u32),
Bias::Left,
)
.to_point(map);
let top_anchor = map
.buffer_snapshot
.anchor_at(scroll_top_buffer_point, Bias::Right);
self.set_anchor( self.set_anchor(
new_anchor, ScrollAnchor {
top_row, anchor: top_anchor,
offset: point(
scroll_position.x.max(0.),
scroll_top - top_anchor.to_display_point(map).row().as_f32(),
),
},
scroll_top_buffer_point.row,
local, local,
autoscroll, autoscroll,
workspace_id, workspace_id,