lostecho/ncspot
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

fix panic caused by strings that where cut outside of char boundary

Browse Source
This commit is contained in:
Henrik Friedrichsen
2019-03-11 21:35:36 +01:00
parent cf31b2204a
commit 90dd26fa02
1 changed files with 16 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/ui/splitbutton.rs
View File

@@ -56,19 +56,25 @@ impl View for SplitButton {
ColorStyle::highlight()
};
// shorten titles that are too long and append ".." to indicate this
let mut left_shortened = self.left.clone();
left_shortened.truncate(printer.size.x - self.right.width() - 1);
if left_shortened.width() < self.left.width() {
let offset = left_shortened.width() - 2;
left_shortened.replace_range(offset.., "..");
}
// draw left string
printer.with_color(style, |printer| {
printer.print((0, 0), &left_shortened);
printer.print((0, 0), &self.left);
});
// track duration goes to the end of the line
// draw ".." to indicate a cut off string
let max_length = printer
.size
.x
.checked_sub(self.right.width() + 1)
.unwrap_or(0);
if max_length < self.left.width() {
let offset = max_length.checked_sub(1).unwrap_or(0);
printer.with_color(style, |printer| {
printer.print((offset, 0), "..");
});
}
// draw right string
let offset = HAlign::Right.get_offset(self.right.width(), printer.size.x);
printer.with_color(style, |printer| {