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

Handle trim on non-ascii messages

Browse source
This commit is contained in:
Alvaro Parker 2025-08-17 19:09:16 -04:00
parent 5662056ea3
commit 33fd16c749
No known key found for this signature in database
1 changed files with 19 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -414,26 +414,28 @@ impl PickerDelegate for StashListDelegate {
Self::format_message(entry_match.entry.index, &entry_match.entry.message); Self::format_message(entry_match.entry.index, &entry_match.entry.message);
let mut positions = entry_match.positions.clone(); let mut positions = entry_match.positions.clone();
if stash_message.is_ascii() { let max_width = self.max_width.to_pixels(window.rem_size());
let max_width = self.max_width.to_pixels(window.rem_size()); let normal_em = {
let normal_em = { let style = window.text_style();
let style = window.text_style(); let font_id = window.text_system().resolve_font(&style.font());
let font_id = window.text_system().resolve_font(&style.font()); let font_size = ui::TextSize::Default.rems(cx).to_pixels(window.rem_size());
let font_size = ui::TextSize::Default.rems(cx).to_pixels(window.rem_size()); let normal = cx
let normal = cx .text_system()
.text_system() .em_width(font_id, font_size)
.em_width(font_id, font_size) .unwrap_or(px(16.));
.unwrap_or(px(16.)); normal
normal };
};
let max_chars = ((max_width * 0.8) / normal_em) as usize; let max_chars = ((max_width * 0.8) / normal_em) as usize;
if stash_message.len() > max_chars && max_chars > 3 { if stash_message.len() > max_chars && max_chars > 1 {
stash_message.truncate(max_chars - 3); let mut index = max_chars - 1;
stash_message.push_str("…"); while !stash_message.is_char_boundary(index) && index != 0 {
positions.retain(|&pos| pos < max_chars - 3); index -= 1;
} }
stash_message.truncate(index);
stash_message.push_str("…");
positions.retain(|&pos| pos < index);
} }
let stash_name = HighlightedLabel::new(stash_message, positions).into_any_element(); let stash_name = HighlightedLabel::new(stash_message, positions).into_any_element();