From efd74f6fb9facf306db777774936cba2a660bb29 Mon Sep 17 00:00:00 2001
From: ClementTsang <clementjhtsang@gmail.com>
Date: Wed, 19 Feb 2020 22:32:04 -0500
Subject: [PATCH] One last change, made head 2 colours const and shared.

---
 src/canvas/canvas_colours.rs              | 3 ---
 src/canvas/canvas_colours/colour_utils.rs | 6 ++++--
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/src/canvas/canvas_colours.rs b/src/canvas/canvas_colours.rs
index 07be3f0f..07aaa480 100644
--- a/src/canvas/canvas_colours.rs
+++ b/src/canvas/canvas_colours.rs
@@ -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,
diff --git a/src/canvas/canvas_colours/colour_utils.rs b/src/canvas/canvas_colours/colour_utils.rs
index 10ae2857..efe2011f 100644
--- a/src/canvas/canvas_colours/colour_utils.rs
+++ b/src/canvas/canvas_colours/colour_utils.rs
@@ -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),