Skip to content
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

Jump to bottom

Fix #793 using width() for column menu alignements with special char #794

Merged
merged 1 commit into from
Jul 6, 2024
Merged

Fix #793 using width() for column menu alignements with special char #794

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
16 changes: 8 additions & 8 deletions src/menu/columnar_menu.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -299,7 +299,7 @@ impl ColumnarMenu {
use_ansi_coloring: bool,
) -> String {
if use_ansi_coloring {
let match_len = self.working_details.shortest_base_string.len();
let match_len = self.working_details.shortest_base_string.width();

// Split string so the match text can be styled
let (match_str, remaining_str) = suggestion.value.split_at(match_len);
Expand Down Expand Up @@ -408,7 +408,7 @@ impl ColumnarMenu {
+ self
.default_details
.col_padding
.saturating_sub(marker.len()),
.saturating_sub(marker.width()),
)
} else {
format!(
Expand All @@ -417,7 +417,7 @@ impl ColumnarMenu {
&suggestion.value,
"",
self.end_of_line(column),
empty = empty_space.saturating_sub(marker.len()),
empty = empty_space.saturating_sub(marker.width()),
)
};

Expand Down Expand Up @@ -500,7 +500,7 @@ impl Menu for ColumnarMenu {
self.working_details.shortest_base_string = base_ranges
.iter()
.map(|range| editor.get_buffer()[range.clone()].to_string())
.min_by_key(|s| s.len())
.min_by_key(|s| s.width())
.unwrap_or_default();

self.reset_position();
Expand Down Expand Up @@ -530,15 +530,15 @@ impl Menu for ColumnarMenu {
self.working_details.col_width = painter.screen_width() as usize;

self.longest_suggestion = self.get_values().iter().fold(0, |prev, suggestion| {
if prev >= suggestion.value.len() {
if prev >= suggestion.value.width() {
prev
} else {
suggestion.value.len()
suggestion.value.width()
}
});
} else {
let max_width = self.get_values().iter().fold(0, |acc, suggestion| {
let str_len = suggestion.value.len() + self.default_details.col_padding;
let str_len = suggestion.value.width() + self.default_details.col_padding;
if str_len > acc {
str_len
} else {
Expand Down Expand Up @@ -654,7 +654,7 @@ impl Menu for ColumnarMenu {
// Correcting the enumerate index based on the number of skipped values
let index = index + skip_values;
let column = index as u16 % self.get_cols();
let empty_space = self.get_width().saturating_sub(suggestion.value.len());
let empty_space = self.get_width().saturating_sub(suggestion.value.width());

self.create_string(suggestion, index, column, empty_space, use_ansi_coloring)
})
Expand Down
Loading