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

Move scale colours to the Colours struct

Browse Source 
Now everything’s customisable (in the future!) in its own place. This was the last thing to do for #65.
This commit is contained in:
Benjamin Sago 2017-05-16 20:54:39 +01:00
parent 10b86aa415
commit b1be274276
1 changed files with 17 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/output/colours.rs
View File

@ -69,6 +69,12 @@ pub struct Permissions {
pub struct Size { pub struct Size {
pub numbers: Style, pub numbers: Style,
pub unit: Style, pub unit: Style,
pub scale_byte: Style,
pub scale_kilo: Style,
pub scale_mega: Style,
pub scale_giga: Style,
pub scale_huge: Style,
} }
#[derive(Clone, Copy, Debug, Default, PartialEq)] #[derive(Clone, Copy, Debug, Default, PartialEq)]
@ -141,6 +147,12 @@ impl Colours {
size: Size { size: Size {
numbers: Green.bold(), numbers: Green.bold(),
unit: Green.normal(), unit: Green.normal(),
scale_byte: Fixed(118).normal(),
scale_kilo: Fixed(190).normal(),
scale_mega: Fixed(226).normal(),
scale_giga: Fixed(220).normal(),
scale_huge: Fixed(214).normal(),
}, },
users: Users { users: Users {
@ -179,19 +191,19 @@ impl Colours {
pub fn file_size(&self, size: u64) -> Style { pub fn file_size(&self, size: u64) -> Style {
if self.scale { if self.scale {
if size < 1024 { if size < 1024 {
Fixed(118).normal() self.size.scale_byte
} }
else if size < 1024 * 1024 { else if size < 1024 * 1024 {
Fixed(190).normal() self.size.scale_kilo
} }
else if size < 1024 * 1024 * 1024 { else if size < 1024 * 1024 * 1024 {
Fixed(226).normal() self.size.scale_mega
} }
else if size < 1024 * 1024 * 1024 * 1024 { else if size < 1024 * 1024 * 1024 * 1024 {
Fixed(220).normal() self.size.scale_giga
} }
else { else {
Fixed(214).normal() self.size.scale_huge
} }
} }
else { else {