One last change, made head 2 colours const and shared.

This commit is contained in:
ClementTsang 2020-02-19 22:32:04 -05:00
parent d6810cbba4
commit efd74f6fb9
2 changed files with 4 additions and 5 deletions

View file

@ -4,9 +4,6 @@ use tui::style::{Color, Modifier, Style};
use crate::{constants::*, utils::error};
const STANDARD_FIRST_COLOUR: Color = Color::LightMagenta;
const STANDARD_SECOND_COLOUR: Color = Color::LightYellow;
pub struct CanvasColours {
pub currently_selected_text_colour: Color,
pub currently_selected_bg_colour: Color,

View file

@ -2,6 +2,8 @@ use crate::utils::{error, gen_util::*};
use tui::style::{Color, Style};
const GOLDEN_RATIO: f32 = 0.618_034; // Approx, good enough for use (also Clippy gets mad if it's too long)
pub const STANDARD_FIRST_COLOUR: Color = Color::LightMagenta;
pub const STANDARD_SECOND_COLOUR: Color = Color::LightYellow;
/// Generates random colours. Strategy found from
/// https://martin.ankerl.com/2009/12/09/how-to-create-random-colors-programmatically/
@ -35,8 +37,8 @@ pub fn gen_n_styles(num_to_gen: i32) -> Vec<Style> {
// throws a tantrum if you don't give it supported colours, but so
// does PowerShell with some colours (Magenta and Yellow)!
let mut colour_vec: Vec<Style> = vec![
Style::default().fg(Color::LightMagenta),
Style::default().fg(Color::LightYellow),
Style::default().fg(STANDARD_FIRST_COLOUR),
Style::default().fg(STANDARD_SECOND_COLOUR),
Style::default().fg(Color::LightRed),
Style::default().fg(Color::LightCyan),
Style::default().fg(Color::LightGreen),