From 5a2297c2a3ef85acffcf5ca90024e0ed95434f18 Mon Sep 17 00:00:00 2001 From: Bennet Bo Fenner Date: Wed, 29 May 2024 20:06:10 +0200 Subject: [PATCH] Fix deleted hunk offset when zooming (#12442) Release Notes: - Fixed an issue where expanded hunks could be rendered at the wrong position when zooming - Fixed an issue where expanded hunks could be rendered at the wrong position when toggling git blame ([#11941](https://github.com/zed-industries/zed/issues/11941)) --- crates/editor/src/hunk_diff.rs | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/crates/editor/src/hunk_diff.rs b/crates/editor/src/hunk_diff.rs index a22399b44b52b373ae7bce655e11cee5502e2e16..b927c0526272220e9f6ed4fe975ac9f2f972f995 100644 --- a/crates/editor/src/hunk_diff.rs +++ b/crates/editor/src/hunk_diff.rs @@ -309,17 +309,18 @@ impl Editor { let deleted_hunk_color = deleted_hunk_color(cx); let (editor_height, editor_with_deleted_text) = editor_with_deleted_text(diff_base_buffer, deleted_hunk_color, hunk, cx); - let parent_gutter_offset = self.gutter_dimensions.width + self.gutter_dimensions.margin; + let editor_model = cx.model().clone(); let mut new_block_ids = self.insert_blocks( Some(BlockProperties { position: hunk.multi_buffer_range.start, height: editor_height.max(deleted_text_height), style: BlockStyle::Flex, - render: Box::new(move |_| { + render: Box::new(move |cx| { + let gutter_dimensions = editor_model.read(cx).gutter_dimensions; div() .bg(deleted_hunk_color) .size_full() - .pl(parent_gutter_offset) + .pl(gutter_dimensions.width + gutter_dimensions.margin) .child(editor_with_deleted_text.clone()) .into_any_element() }),