From a695322f83f2ad5d8d462b732a7141755d70ebba Mon Sep 17 00:00:00 2001
From: Mikayla Maki <mikayla@zed.dev>
Date: Thu, 27 Jun 2024 11:19:27 -0700
Subject: [PATCH] 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)
---
 crates/editor/src/scroll.rs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/crates/editor/src/scroll.rs b/crates/editor/src/scroll.rs
index 29c4f8e659..cc39645e7c 100644
--- a/crates/editor/src/scroll.rs
+++ b/crates/editor/src/scroll.rs
@@ -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.)