From bd784b42c17fa8a7e81f8ca6f8e9f292300000df Mon Sep 17 00:00:00 2001 From: Finn Evers Date: Wed, 17 Sep 2025 20:37:36 +0200 Subject: [PATCH] editor: Properly layout expand toggles with git blame enabled (#38349) Release Notes: - Fixed an issue where expand toggles were too large with the git blame deployed. --- crates/editor/src/element.rs | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/crates/editor/src/element.rs b/crates/editor/src/element.rs index 230c3160fb616984f71ce12b7b3b6b8d459d6356..928c092b58cd99ac2a4fdf91ac52b20f84c2e645 100644 --- a/crates/editor/src/element.rs +++ b/crates/editor/src/element.rs @@ -3015,6 +3015,12 @@ impl EditorElement { .ilog10() + 1; + let git_gutter_width = Self::gutter_strip_width(line_height) + + gutter_dimensions + .git_blame_entries_width + .unwrap_or_default(); + let available_width = gutter_dimensions.left_padding - git_gutter_width; + buffer_rows .iter() .enumerate() @@ -3030,9 +3036,6 @@ impl EditorElement { ExpandExcerptDirection::UpAndDown => IconName::ExpandVertical, }; - let git_gutter_width = Self::gutter_strip_width(line_height); - let available_width = gutter_dimensions.left_padding - git_gutter_width; - let editor = self.editor.clone(); let is_wide = max_line_number_length >= EditorSettings::get_global(cx).gutter.min_line_number_digits as u32