From b00740a7dd4f49b89370e77bd34553d648f7f647 Mon Sep 17 00:00:00 2001
From: ClementTsang <cjhtsang@uwaterloo.ca>
Date: Thu, 27 Feb 2020 17:54:39 -0500
Subject: [PATCH] Added total rx + tx colouring options.

---
 src/canvas.rs                             | 20 ++++++++++++--------
 src/canvas/canvas_colours.rs              | 18 +++++++++++++++---
 src/canvas/canvas_colours/colour_utils.rs |  6 ++++--
 src/main.rs                               | 10 ++++++++++
 4 files changed, 41 insertions(+), 13 deletions(-)

diff --git a/src/canvas.rs b/src/canvas.rs
index 24644a27..00d7130f 100644
--- a/src/canvas.rs
+++ b/src/canvas.rs
@@ -901,14 +901,18 @@ impl Painter {
 					})
 					.style(self.colours.tx_style)
 					.data(&network_data_tx),
-				Dataset::default().name(&format!(
-					"Total RX: {:7}",
-					app_state.canvas_data.total_rx_display
-				)),
-				Dataset::default().name(&format!(
-					"Total TX: {:7}",
-					app_state.canvas_data.total_tx_display
-				)),
+				Dataset::default()
+					.name(&format!(
+						"Total RX: {:7}",
+						app_state.canvas_data.total_rx_display
+					))
+					.style(self.colours.rx_total_style),
+				Dataset::default()
+					.name(&format!(
+						"Total TX: {:7}",
+						app_state.canvas_data.total_tx_display
+					))
+					.style(self.colours.tx_total_style),
 			])
 			.render(f, draw_loc);
 	}
diff --git a/src/canvas/canvas_colours.rs b/src/canvas/canvas_colours.rs
index b69a98ab..949a90c5 100644
--- a/src/canvas/canvas_colours.rs
+++ b/src/canvas/canvas_colours.rs
@@ -13,6 +13,8 @@ pub struct CanvasColours {
 	pub swap_style: Style,
 	pub rx_style: Style,
 	pub tx_style: Style,
+	pub rx_total_style: Style,
+	pub tx_total_style: Style,
 	pub avg_colour_style: Style,
 	pub cpu_colour_styles: Vec<Style>,
 	pub border_style: Style,
@@ -30,13 +32,13 @@ impl Default for CanvasColours {
 			currently_selected_text_colour: Color::Black,
 			currently_selected_bg_colour: Color::Cyan,
 			currently_selected_text_style: Style::default().fg(Color::Black).bg(Color::Cyan),
-			table_header_style: Style::default()
-				.fg(Color::LightBlue)
-				.modifier(Modifier::BOLD),
+			table_header_style: Style::default().fg(Color::LightBlue),
 			ram_style: Style::default().fg(STANDARD_FIRST_COLOUR),
 			swap_style: Style::default().fg(STANDARD_SECOND_COLOUR),
 			rx_style: Style::default().fg(STANDARD_FIRST_COLOUR),
 			tx_style: Style::default().fg(STANDARD_SECOND_COLOUR),
+			rx_total_style: Style::default().fg(STANDARD_THIRD_COLOUR),
+			tx_total_style: Style::default().fg(STANDARD_FOURTH_COLOUR),
 			avg_colour_style: Style::default().fg(AVG_COLOUR),
 			cpu_colour_styles: Vec::new(),
 			border_style: Style::default().fg(text_colour),
@@ -89,6 +91,16 @@ impl CanvasColours {
 		Ok(())
 	}
 
+	pub fn set_rx_total_colour(&mut self, colour: &str) -> error::Result<()> {
+		self.rx_total_style = get_style_from_config(colour)?;
+		Ok(())
+	}
+
+	pub fn set_tx_total_colour(&mut self, colour: &str) -> error::Result<()> {
+		self.tx_total_style = get_style_from_config(colour)?;
+		Ok(())
+	}
+
 	pub fn set_avg_cpu_colour(&mut self, colour: &str) -> error::Result<()> {
 		self.avg_colour_style = get_style_from_config(colour)?;
 		Ok(())
diff --git a/src/canvas/canvas_colours/colour_utils.rs b/src/canvas/canvas_colours/colour_utils.rs
index 6842f575..c7e32a23 100644
--- a/src/canvas/canvas_colours/colour_utils.rs
+++ b/src/canvas/canvas_colours/colour_utils.rs
@@ -5,6 +5,8 @@ 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;
+pub const STANDARD_THIRD_COLOUR: Color = Color::LightCyan;
+pub const STANDARD_FOURTH_COLOUR: Color = Color::LightGreen;
 pub const AVG_COLOUR: Color = Color::Red;
 
 lazy_static! {
@@ -66,8 +68,8 @@ pub fn gen_n_styles(num_to_gen: i32) -> Vec<Style> {
 	let mut colour_vec: Vec<Style> = vec![
 		Style::default().fg(STANDARD_FIRST_COLOUR),
 		Style::default().fg(STANDARD_SECOND_COLOUR),
-		Style::default().fg(Color::LightCyan),
-		Style::default().fg(Color::LightGreen),
+		Style::default().fg(STANDARD_THIRD_COLOUR),
+		Style::default().fg(STANDARD_FOURTH_COLOUR),
 		Style::default().fg(Color::LightBlue),
 		Style::default().fg(Color::LightRed),
 		Style::default().fg(Color::Cyan),
diff --git a/src/main.rs b/src/main.rs
index e1c80dcd..ef0b506d 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -93,6 +93,8 @@ struct ConfigColours {
 	swap_color: Option<String>,
 	rx_color: Option<String>,
 	tx_color: Option<String>,
+	rx_total_color: Option<String>,
+	tx_total_color: Option<String>,
 	border_color: Option<String>,
 	highlighted_border_color: Option<String>,
 	text_color: Option<String>,
@@ -731,6 +733,14 @@ fn generate_config_colours(config: &Config, painter: &mut canvas::Painter) -> er
 			painter.colours.set_tx_colour(tx_color)?;
 		}
 
+		if let Some(rx_total_color) = &colours.rx_total_color {
+			painter.colours.set_rx_total_colour(rx_total_color)?;
+		}
+
+		if let Some(tx_total_color) = &colours.tx_total_color {
+			painter.colours.set_tx_total_colour(tx_total_color)?;
+		}
+
 		if let Some(table_header_color) = &colours.table_header_color {
 			painter
 				.colours