Llewellyn/exa
1
0
Fork 0
mirror of https://github.com/Llewellynvdm/exa.git synced 2024-11-25 13:27:33 +00:00
Code Issues Projects Releases Wiki Activity

Use thousand separators again and fix alignement when it’s not ASCII

Browse Source
This commit is contained in:
ariasuni 2021-04-06 15:18:37 +02:00
parent 505808fd9f
commit 7a4cde75eb
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/output/render/size.rs
View File

@ -36,20 +36,20 @@ impl f::Size {
}; };
let (prefix, n) = match result { let (prefix, n) = match result {
NumberPrefix::Standalone(b) => return TextCell::paint(colours.size(None), b.to_string()), NumberPrefix::Standalone(b) => return TextCell::paint(colours.size(None), numerics.format_int(b)),
NumberPrefix::Prefixed(p, n) => (p, n), NumberPrefix::Prefixed(p, n) => (p, n),
}; };
let symbol = prefix.symbol(); let symbol = prefix.symbol();
let decimal_to_diplay = if n < 10_f64 { 1 } else { 0 }; let number = if n < 10_f64 {
let number = numerics.format_float(n, decimal_to_diplay); numerics.format_float(n, 1)
} else {
numerics.format_int(n.round() as isize)
};
// The numbers and symbols are guaranteed to be written in ASCII, so
// we can skip the display width calculation.
let width = DisplayWidth::from(number.len() + symbol.len());
TextCell { TextCell {
width, // symbol is guaranteed to be ASCII since unit prefixes are hardcoded.
width: DisplayWidth::from(&*number) + symbol.len(),
contents: vec![ contents: vec![
colours.size(Some(prefix)).paint(number), colours.size(Some(prefix)).paint(number),
colours.unit(Some(prefix)).paint(symbol), colours.unit(Some(prefix)).paint(symbol),