editor: Properly layout expand toggles with git blame enabled (#38349)

Finn Evers created 1 month ago

Release Notes:

- Fixed an issue where expand toggles were too large with the git blame
deployed.

Change summary

crates/editor/src/element.rs | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)

Detailed changes

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