mirror of
https://github.com/zed-industries/zed.git
synced 2024-09-18 18:08:07 +03:00
Fix incorrect point types in scroll calculations (#13600)
fixes https://github.com/zed-industries/zed/issues/13559 Release Notes: - Fixed incorrect scroll behavior when using different `scroll_beyond_last_line` settings ([#13559](https://github.com/zed-industries/zed/issues/13559)) (preview only)
This commit is contained in:
parent
cb2d05b78f
commit
a695322f83
@ -205,7 +205,7 @@ impl ScrollManager {
|
||||
ScrollBeyondLastLine::OnePage => scroll_top,
|
||||
ScrollBeyondLastLine::Off => {
|
||||
if let Some(height_in_lines) = self.visible_line_count {
|
||||
let max_row = map.max_buffer_row().as_f32();
|
||||
let max_row = map.max_point().row().0 as f32;
|
||||
scroll_top.min(max_row - height_in_lines + 1.).max(0.)
|
||||
} else {
|
||||
scroll_top
|
||||
@ -213,7 +213,7 @@ impl ScrollManager {
|
||||
}
|
||||
ScrollBeyondLastLine::VerticalScrollMargin => {
|
||||
if let Some(height_in_lines) = self.visible_line_count {
|
||||
let max_row = map.max_buffer_row().as_f32();
|
||||
let max_row = map.max_point().row().0 as f32;
|
||||
scroll_top
|
||||
.min(max_row - height_in_lines + 1. + self.vertical_scroll_margin)
|
||||
.max(0.)
|
||||
|
Loading…
Reference in New Issue
Block a user