From 598239a3bcfee96545bc5364a4141f9131fada2a Mon Sep 17 00:00:00 2001
From: Rupert Rutledge <eosis2 [at] gmail.com>
Date: Fri, 8 May 2020 11:54:30 +0100
Subject: Address PR feedback.

 - Only show the capture time on use of the utilization flag
 - Make colour consistent in header
 - Prioritize rendering of the Bandwidth over the duration
 - Reduce length of time description
---
 src/display/components/total_bandwidth.rs | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/src/display/components/total_bandwidth.rs b/src/display/components/total_bandwidth.rs
index 0581330..dbc2e78 100644
--- a/src/display/components/total_bandwidth.rs
+++ b/src/display/components/total_bandwidth.rs
@@ -14,19 +14,19 @@ pub struct HeaderDetails<'a> {
 
 impl<'a> HeaderDetails<'a> {
     pub fn render(&self, frame: &mut Frame<impl Backend>, rect: Rect) {
-        self.render_bandwidth(frame, rect);
-        self.render_elapsed_time(frame, rect);
+        let color = if self.paused {
+            Color::Yellow
+        } else {
+            Color::Green
+        };
+        if self.state.cumulative_mode { self.render_elapsed_time(frame, rect, &color) };
+        self.render_bandwidth(frame, rect, &color);
     }
 
-    fn render_bandwidth(&self, frame: &mut Frame<impl Backend>, rect: Rect) {
+    fn render_bandwidth(&self, frame: &mut Frame<impl Backend>, rect: Rect, color: &Color) {
         let c_mode = self.state.cumulative_mode;
         let title_text = {
             let paused_str = if self.paused { "[PAUSED]" } else { "" };
-            let color = if self.paused {
-                Color::Yellow
-            } else {
-                Color::Green
-            };
 
             [Text::styled(
                 format!(
@@ -41,7 +41,7 @@ impl<'a> HeaderDetails<'a> {
                     },
                     paused_str
                 ),
-                Style::default().fg(color).modifier(Modifier::BOLD),
+                Style::default().fg(*color).modifier(Modifier::BOLD),
             )]
         };
 
@@ -50,16 +50,16 @@ impl<'a> HeaderDetails<'a> {
             .render(frame, rect);
     }
 
-    fn render_elapsed_time(&self, frame: &mut Frame<impl Backend>, rect: Rect) {
+    fn render_elapsed_time(&self, frame: &mut Frame<impl Backend>, rect: Rect, color: &Color) {
         let elapsed_time_text = [Text::styled(
             format!(
-                "Total Elapsed Time: {:02}:{:02}:{:02} ",
+                "Duration: {:02}:{:02}:{:02} ",
                 self.elapsed_time.as_secs() / 3600,
                 (self.elapsed_time.as_secs() % 3600) / 60,
                 self.elapsed_time.as_secs() % 60
             ),
             Style::default()
-                .fg(Color::LightBlue)
+                .fg(*color)
                 .modifier(Modifier::BOLD),
         )];
         Paragraph::new(elapsed_time_text.iter())
-- 
cgit v1.2.3