diff options
author | ClementTsang <cjhtsang@uwaterloo.ca> | 2021-11-23 22:34:50 -0500 |
---|---|---|
committer | ClementTsang <cjhtsang@uwaterloo.ca> | 2021-11-23 22:34:50 -0500 |
commit | e89d46e10ff316e707687d0f60517e33ce5f07a3 (patch) | |
tree | a56dc0c1aa2fb0cd4b26c15f678b314b71f519ae /src/app/widgets | |
parent | 16babea2021686b0189ff104d73e71127129ca3c (diff) |
refactor: Add CPU load back
Diffstat (limited to 'src/app/widgets')
-rw-r--r-- | src/app/widgets/bottom_widgets/cpu.rs | 11 | ||||
-rw-r--r-- | src/app/widgets/tui_stuff/block_builder.rs | 8 |
2 files changed, 14 insertions, 5 deletions
diff --git a/src/app/widgets/bottom_widgets/cpu.rs b/src/app/widgets/bottom_widgets/cpu.rs index 1a312aac..9d01cdf9 100644 --- a/src/app/widgets/bottom_widgets/cpu.rs +++ b/src/app/widgets/bottom_widgets/cpu.rs @@ -12,6 +12,7 @@ use crate::{ event::{ComponentEventResult, SelectionAction}, text_table::SimpleColumn, time_graph::TimeGraphData, + widgets::tui_stuff::BlockBuilder, AppConfigFields, Component, DataCollection, TextTable, TimeGraph, Widget, }, canvas::Painter, @@ -251,8 +252,14 @@ impl Widget for CpuGraph { }) .collect::<Vec<_>>(); - let graph_block = self - .block() + let name = format!( + "{} ─ {:.2} {:.2} {:.2}", + self.get_pretty_name(), + self.load_avg_data[0], + self.load_avg_data[1], + self.load_avg_data[2], + ); + let graph_block = BlockBuilder::new(name) .selected(selected && matches!(&self.selected, CpuGraphSelection::Graph)) .show_esc(expanded) .build(painter, graph_block_area); diff --git a/src/app/widgets/tui_stuff/block_builder.rs b/src/app/widgets/tui_stuff/block_builder.rs index cec835e3..9b503ed6 100644 --- a/src/app/widgets/tui_stuff/block_builder.rs +++ b/src/app/widgets/tui_stuff/block_builder.rs @@ -1,3 +1,5 @@ +use std::borrow::Cow; + use tui::{ layout::Rect, text::Span, @@ -11,19 +13,19 @@ pub struct BlockBuilder { borders: Borders, selected: bool, show_esc: bool, - name: &'static str, + name: Cow<'static, str>, hide_title: bool, extra_text: Option<String>, } impl BlockBuilder { /// Creates a new [`BlockBuilder`] with the name of block. - pub fn new(name: &'static str) -> Self { + pub fn new<S: Into<Cow<'static, str>>>(name: S) -> Self { Self { borders: Borders::ALL, selected: false, show_esc: false, - name, + name: name.into(), hide_title: false, extra_text: None, } |