Yehowshua/ZIm
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix alignment in git blame gutter (#10067)

Browse source 
Fixes #9977.

Instead of doing nasty string alignment, this now uses the layout
engine.

![screenshot-2024-04-02-10 13
20@2x](https://github.com/zed-industries/zed/assets/1185253/ef167f9d-50de-4cc9-8a93-659a676c7855)


Release Notes:

- N/A
This commit is contained in:
Thorsten Ball 2024-04-02 13:36:28 +02:00 • committed by GitHub
parent b43602f21b
commit 84cca62b2e
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 8 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

15
crates/editor/src/element.rs
View file

@ -2909,17 +2909,14 @@ fn render_blame_entry(
let pretty_commit_id = format!("{}", blame_entry.sha); let pretty_commit_id = format!("{}", blame_entry.sha);
let short_commit_id = pretty_commit_id.clone().chars().take(6).collect::<String>(); let short_commit_id = pretty_commit_id.clone().chars().take(6).collect::<String>();
let name = blame_entry.author.as_deref().unwrap_or("<no name>"); let author_name = blame_entry.author.as_deref().unwrap_or("<no name>");
let name = if name.len() > 20 { let name = util::truncate_and_trailoff(author_name, 20);
format!("{}...", &name[..16])
} else {
name.to_string()
};
let permalink = blame.read(cx).permalink_for_entry(&blame_entry); let permalink = blame.read(cx).permalink_for_entry(&blame_entry);
let commit_message = blame.read(cx).message_for_entry(&blame_entry); let commit_message = blame.read(cx).message_for_entry(&blame_entry);
h_flex() h_flex()
.w_full()
.font(text_style.font().family) .font(text_style.font().family)
.line_height(text_style.line_height) .line_height(text_style.line_height)
.id(("blame", ix)) .id(("blame", ix))
@ -2929,8 +2926,12 @@ fn render_blame_entry(
.child(short_commit_id) .child(short_commit_id)
.mr_2(), .mr_2(),
div() div()
.w_full()
.h_flex()
.justify_between()
.text_color(cx.theme().status().hint) .text_color(cx.theme().status().hint)
.child(format!("{:20} {: >14}", name, relative_timestamp)), .child(name)
.child(relative_timestamp),
]) ])
.on_mouse_down(MouseButton::Right, { .on_mouse_down(MouseButton::Right, {
let blame_entry = blame_entry.clone(); let blame_entry = blame_entry.clone();