Skip to content

git_ui: Layout/spacing tweaks for Blame tooltip #40130

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
danilo-leal merged 2 commits into from
Oct 14, 2025
Merged

git_ui: Layout/spacing tweaks for Blame tooltip #40130

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
62aba9e
git_ui: Layout/spacing tweaks for Blame tooltip
Simek Oct 13, 2025
2d9229c
Add some layout tweaks
danilo-leal Oct 14, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
38 changes: 18 additions & 20 deletions crates/git_ui/src/blame_ui.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ use settings::Settings as _;
use theme::ThemeSettings;
use time::OffsetDateTime;
use time_format::format_local_timestamp;
use ui::{ContextMenu, Divider, IconButtonShape, prelude::*, tooltip_container};
use ui::{ContextMenu, Divider, prelude::*, tooltip_container};
use workspace::Workspace;

const GIT_BLAME_MAX_AUTHOR_CHARS_DISPLAYED: usize = 20;
Expand Down Expand Up @@ -61,16 +61,15 @@ impl BlameRenderer for GitBlameRenderer {
.mr_2()
.child(
h_flex()
.id(("blame", ix))
.w_full()
.gap_2()
.justify_between()
.font_family(style.font().family)
.line_height(style.line_height)
.id(("blame", ix))
.text_color(cx.theme().status().hint)
.gap_2()
.child(
h_flex()
.items_center()
.gap_2()
.child(div().text_color(sha_color).child(short_commit_id))
.children(avatar)
Expand Down Expand Up @@ -250,20 +249,21 @@ impl BlameRenderer for GitBlameRenderer {
};

Some(
tooltip_container(cx, |d, cx| {
d.occlude()
tooltip_container(cx, |this, cx| {
this.occlude()
.on_mouse_move(|_, _, cx| cx.stop_propagation())
.on_mouse_down(MouseButton::Left, |_, _, cx| cx.stop_propagation())
.child(
v_flex()
.w(gpui::rems(30.))
.gap_4()
.child(
h_flex()
.pb_1p5()
.gap_x_2()
.pb_1()
.gap_2()
.overflow_x_hidden()
.flex_wrap()
.border_b_1()
.border_color(cx.theme().colors().border_variant)
.children(avatar)
.child(author)
.when(!author_email.is_empty(), |this| {
Expand All @@ -272,30 +272,29 @@ impl BlameRenderer for GitBlameRenderer {
.text_color(cx.theme().colors().text_muted)
.child(author_email.to_owned()),
)
})
.border_b_1()
.border_color(cx.theme().colors().border_variant),
}),
)
.child(
div()
.id("inline-blame-commit-message")
.child(message)
.track_scroll(&scroll_handle)
.py_1p5()
.max_h(message_max_height)
.overflow_y_scroll()
.track_scroll(&scroll_handle),
.child(message),
)
.child(
h_flex()
.text_color(cx.theme().colors().text_muted)
.w_full()
.justify_between()
.pt_1p5()
.pt_1()
.border_t_1()
.border_color(cx.theme().colors().border_variant)
.child(absolute_timestamp)
.child(
h_flex()
.gap_1p5()
.gap_1()
.when_some(pull_request, |this, pr| {
this.child(
Button::new(
Expand All @@ -306,24 +305,24 @@ impl BlameRenderer for GitBlameRenderer {
.icon(IconName::PullRequest)
.icon_color(Color::Muted)
.icon_position(IconPosition::Start)
.style(ButtonStyle::Subtle)
.icon_size(IconSize::Small)
.on_click(move |_, _, cx| {
cx.stop_propagation();
cx.open_url(pr.url.as_str())
}),
)
.child(Divider::vertical())
})
.child(Divider::vertical())
.child(
Button::new(
"commit-sha-button",
short_commit_id.clone(),
)
.style(ButtonStyle::Subtle)
.color(Color::Muted)
.icon(IconName::FileGit)
.icon_color(Color::Muted)
.icon_position(IconPosition::Start)
.icon_size(IconSize::Small)
.on_click(move |_, window, cx| {
CommitView::open(
commit_summary.clone(),
Expand All @@ -337,7 +336,6 @@ impl BlameRenderer for GitBlameRenderer {
)
.child(
IconButton::new("copy-sha-button", IconName::Copy)
.shape(IconButtonShape::Square)
.icon_size(IconSize::Small)
.icon_color(Color::Muted)
.on_click(move |_, _, cx| {
Expand Down
Loading