Merge branch 'main' into v3-editor-layout-floatie

crates/editor/src/element.rs

@@ -966,7 +966,6 @@ impl EditorElement {
         text_hitbox: &Hitbox,
         content_origin: gpui::Point<Pixels>,
         scroll_position: gpui::Point<f32>,
-        scroll_pixel_position: gpui::Point<Pixels>,
         line_height: Pixels,
         em_width: Pixels,
         autoscroll_containing_element: bool,
@@ -1031,10 +1030,8 @@ impl EditorElement {
                         None
                     };
 
-                    let x = cursor_character_x - scroll_pixel_position.x;
-                    let y = (cursor_position.row().as_f32()
-                        - scroll_pixel_position.y / line_height)
-                        * line_height;
+                    let x = cursor_character_x - scroll_position.x * em_width;
+                    let y = (cursor_position.row().as_f32() - scroll_position.y) * line_height;
                     if selection.is_newest {
                         editor.pixel_position_of_newest_cursor = Some(point(
                             text_hitbox.origin.x + x + block_width / 2.,
@@ -1174,7 +1171,7 @@ impl EditorElement {
         line_height: Pixels,
         gutter_dimensions: &GutterDimensions,
         gutter_settings: crate::editor_settings::Gutter,
-        scroll_pixel_position: gpui::Point<Pixels>,
+        scroll_position: gpui::Point<f32>,
         gutter_hitbox: &Hitbox,
         cx: &mut WindowContext,
     ) {
@@ -3405,11 +3402,11 @@ impl EditorElement {
                 };
 
                 let start_y = layout.gutter_hitbox.top()
-                    + start_row.0 as f32 * layout.position_map.line_height
-                    - layout.position_map.scroll_pixel_position.y;
+                    + (start_row.0 as f32 - layout.position_map.scroll_position.y)
+                        * layout.position_map.line_height;
                 let end_y = layout.gutter_hitbox.top()
-                    + (end_row.0 + 1) as f32 * layout.position_map.line_height
-                    - layout.position_map.scroll_pixel_position.y;
+                    + ((end_row.0 + 1) as f32 - layout.position_map.scroll_position.y)
+                        * layout.position_map.line_height;
                 let bounds = Bounds::from_corners(
                     point(layout.gutter_hitbox.left(), start_y),
                     point(layout.gutter_hitbox.left() + highlight_width, end_y),
@@ -3903,8 +3900,9 @@ impl EditorElement {
                 line_height: layout.position_map.line_height,
                 corner_radius,
                 start_y: layout.content_origin.y
-                    + row_range.start.as_f32() * layout.position_map.line_height
-                    - layout.position_map.scroll_pixel_position.y,
+                    + (row_range.start.as_f32() - layout.position_map.scroll_position.y)
+                        * layout.position_map.line_height,
+
                 lines: row_range
                     .iter_rows()
                     .map(|row| {
@@ -3914,18 +3912,17 @@ impl EditorElement {
                             start_x: if row == range.start.row() {
                                 layout.content_origin.x
                                     + line_layout.x_for_index(range.start.column() as usize)
-                                    - layout.position_map.scroll_pixel_position.x
+                                    - layout.position_map.scroll_x_offset()
                             } else {
-                                layout.content_origin.x
-                                    - layout.position_map.scroll_pixel_position.x
+                                layout.content_origin.x - layout.position_map.scroll_x_offset()
                             },
                             end_x: if row == range.end.row() {
                                 layout.content_origin.x
                                     + line_layout.x_for_index(range.end.column() as usize)
-                                    - layout.position_map.scroll_pixel_position.x
+                                    - layout.position_map.scroll_x_offset()
                             } else {
                                 layout.content_origin.x + line_layout.width + line_end_overshoot
-                                    - layout.position_map.scroll_pixel_position.x
+                                    - layout.position_map.scroll_x_offset()
                             },
                         }
                     })
@@ -4578,11 +4575,10 @@ impl LineWithInvisibles {
         cx: &mut WindowContext,
     ) {
         let line_height = layout.position_map.line_height;
-        let line_y = line_height
-            * (row.as_f32() - layout.position_map.scroll_pixel_position.y / line_height);
+        let line_y = line_height * (row.as_f32() - layout.position_map.scroll_position.y);
 
         let mut fragment_origin =
-            content_origin + gpui::point(-layout.position_map.scroll_pixel_position.x, line_y);
+            content_origin + gpui::point(-layout.position_map.scroll_x_offset(), line_y);
 
         for fragment in &self.fragments {
             match fragment {
@@ -4636,7 +4632,7 @@ impl LineWithInvisibles {
                 (layout.position_map.em_width - invisible_symbol.width).max(Pixels::ZERO) / 2.0;
             let origin = content_origin
                 + gpui::point(
-                    x_offset + invisible_offset - layout.position_map.scroll_pixel_position.x,
+                    x_offset + invisible_offset - layout.position_map.scroll_x_offset(),
                     line_y,
                 );
 
@@ -5248,7 +5244,6 @@ impl Element for EditorElement {
                             scroll_position = snapshot.scroll_position();
                         }
                     });
-
                     let scroll_pixel_position = point(
                         scroll_position.x * em_width,
                         scroll_position.y * line_height,
@@ -5573,7 +5568,7 @@ impl Element for EditorElement {
                         mode: snapshot.mode,
                         position_map: Rc::new(PositionMap {
                             size: bounds.size,
-                            scroll_pixel_position,
+                            scroll_position,
                             scroll_max,
                             line_layouts,
                             line_height,
@@ -5880,7 +5875,7 @@ struct CreaseTrailerLayout {
 struct PositionMap {
     size: Size<Pixels>,
     line_height: Pixels,
-    scroll_pixel_position: gpui::Point<Pixels>,
+    scroll_position: gpui::Point<f32>,
     scroll_max: gpui::Point<f32>,
     em_width: Pixels,
     em_advance: Pixels,
@@ -5944,6 +5939,9 @@ impl PositionMap {
             column_overshoot_after_line_end,
         }
     }
+    fn scroll_x_offset(&self) -> Pixels {
+        self.em_width * self.scroll_position.x
+    }
 }
 
 struct BlockLayout {