diff options
Diffstat (limited to 'src/canvas')
| -rw-r--r-- | src/canvas/canvas_colours.rs | 13 | ||||
| -rw-r--r-- | src/canvas/canvas_colours/colour_utils.rs | 17 |
2 files changed, 12 insertions, 18 deletions
diff --git a/src/canvas/canvas_colours.rs b/src/canvas/canvas_colours.rs index fd8d4eb0..4979f597 100644 --- a/src/canvas/canvas_colours.rs +++ b/src/canvas/canvas_colours.rs @@ -48,7 +48,18 @@ impl Default for CanvasColours { total_tx_style: Style::default().fg(STANDARD_FOURTH_COLOUR), all_colour_style: Style::default().fg(ALL_COLOUR), avg_colour_style: Style::default().fg(AVG_COLOUR), - cpu_colour_styles: colour_utils::get_default_cpu_colours(), + cpu_colour_styles: vec![ + Style::default().fg(Color::LightMagenta), + Style::default().fg(Color::LightYellow), + Style::default().fg(Color::LightCyan), + Style::default().fg(Color::LightGreen), + Style::default().fg(Color::LightBlue), + Style::default().fg(Color::LightRed), + Style::default().fg(Color::Cyan), + Style::default().fg(Color::Green), + Style::default().fg(Color::Blue), + Style::default().fg(Color::Red), + ], border_style: Style::default().fg(text_colour), highlighted_border_style: Style::default().fg(STANDARD_HIGHLIGHT_COLOUR), text_style: Style::default().fg(text_colour), diff --git a/src/canvas/canvas_colours/colour_utils.rs b/src/canvas/canvas_colours/colour_utils.rs index 048f9317..3cad2686 100644 --- a/src/canvas/canvas_colours/colour_utils.rs +++ b/src/canvas/canvas_colours/colour_utils.rs @@ -40,23 +40,6 @@ lazy_static! { .collect(); } -/// We take basically no chances with this. If the user wants prettier colours, they can -/// set it on their own - unfortunately, supported colour detection is kinda a PITA. -pub fn get_default_cpu_colours() -> Vec<Style> { - vec![ - Style::default().fg(Color::LightMagenta), - Style::default().fg(Color::LightYellow), - Style::default().fg(Color::LightCyan), - Style::default().fg(Color::LightGreen), - Style::default().fg(Color::LightBlue), - Style::default().fg(Color::LightRed), - Style::default().fg(Color::Cyan), - Style::default().fg(Color::Green), - Style::default().fg(Color::Blue), - Style::default().fg(Color::Red), - ] -} - pub fn convert_hex_to_color(hex: &str) -> error::Result<Color> { fn hex_err(hex: &str) -> error::Result<u8> { Err( |