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

Render branch on new line

Browse source
This commit is contained in:
Alvaro Parker 2025-08-18 23:10:53 -04:00
parent ec4c2f5fd0
commit ea7e0c4759
No known key found for this signature in database
1 changed files with 6 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

19
crates/git_ui/src/stash_picker.rs
View file

@ -393,7 +393,7 @@ impl PickerDelegate for StashListDelegate {
normal
};
let max_chars = ((max_width * 0.7) / normal_em) as usize;
let max_chars = ((max_width * 0.9) / normal_em) as usize;
if stash_message.len() > max_chars && max_chars > 1 {
let mut index = max_chars - 1;
@ -408,7 +408,7 @@ impl PickerDelegate for StashListDelegate {
let stash_name = HighlightedLabel::new(stash_message, positions).into_any_element();
let mut branch_name = entry_match.entry.branch.clone().unwrap_or_default();
let max_branch_chars = ((max_width * 0.3) / normal_em) as usize;
let max_branch_chars = ((max_width * 0.9) / normal_em) as usize;
if branch_name.len() > max_branch_chars && max_branch_chars > 1 {
let mut index = max_branch_chars - 1;
while !branch_name.is_char_boundary(index) && index != 0 {
@ -418,9 +418,7 @@ impl PickerDelegate for StashListDelegate {
branch_name.push_str("…");
}
let stash_index_label = Label::new(branch_name)
.size(LabelSize::Small)
.color(Color::Muted);
let stash_index_label = Label::new(branch_name).color(Color::Muted);
let tooltip_text = format!(
"stash@{{{}}} created {}",
@ -433,14 +431,9 @@ impl PickerDelegate for StashListDelegate {
.spacing(ListItemSpacing::Sparse)
.toggle_state(selected)
.child(
v_flex().w_full().overflow_hidden().child(
h_flex()
.gap_6()
.justify_between()
.overflow_x_hidden()
.child(stash_name)
.child(stash_index_label.into_element()),
),
v_flex()
.child(stash_name)
.child(stash_index_label.into_element()),
)
.tooltip(Tooltip::text(tooltip_text)),
)