diff options
| author | Clement Tsang <34804052+ClementTsang@users.noreply.github.com> | 2020-08-16 01:25:59 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-08-16 04:25:59 -0400 |
| commit | 08e49b63c162f16cb35262cd48da324c779c1a1c (patch) | |
| tree | 446d654cb60cbd0475b193b6e28900bad46c88e8 /src/canvas/widgets/cpu_basic.rs | |
| parent | 9068108d0fe977ec6fc01dc7d8d29674a88c2f6a (diff) | |
refactor: Revert tui upgrade to 0.10
Reverts tui upgrade, there are some bugs and issues - namely, issues with rendering text.
We can revert this commit when those bugs are dealt with (should be fine after 0.10.1, tested building from the repo).
Diffstat (limited to 'src/canvas/widgets/cpu_basic.rs')
| -rw-r--r-- | src/canvas/widgets/cpu_basic.rs | 22 |
1 files changed, 13 insertions, 9 deletions
diff --git a/src/canvas/widgets/cpu_basic.rs b/src/canvas/widgets/cpu_basic.rs index c8db2f33..4683a677 100644 --- a/src/canvas/widgets/cpu_basic.rs +++ b/src/canvas/widgets/cpu_basic.rs @@ -11,8 +11,7 @@ use tui::{ backend::Backend, layout::{Constraint, Direction, Layout, Rect}, terminal::Frame, - text::{Span, Spans}, - widgets::{Block, Paragraph}, + widgets::{Block, Paragraph, Text}, }; pub trait CpuBasicWidget { @@ -77,10 +76,10 @@ impl CpuBasicWidget for Painter { let num_bars = calculate_basic_use_bars(use_percentage, bar_length); format!( - "{:3}[{}{}{:3.0}%]", + "{:3}[{}{}{:3.0}%]\n", if app_state.app_config_fields.show_average_cpu { if cpu_index == 0 { - " AVG".to_string() + "AVG".to_string() } else { (cpu_index - 1).to_string() } @@ -109,11 +108,16 @@ impl CpuBasicWidget for Painter { let end_index = min(start_index + how_many_cpus, num_cpus); let cpu_column = (start_index..end_index) .map(|cpu_index| { - Spans::from(Span { - content: (&cpu_bars[cpu_index]).into(), - style: self.colours.cpu_colour_styles + // Spans::from(Span { + // content: (&cpu_bars[cpu_index]).into(), + // style: self.colours.cpu_colour_styles + // [cpu_index % self.colours.cpu_colour_styles.len()], + // }) + Text::styled( + &cpu_bars[cpu_index], + self.colours.cpu_colour_styles [cpu_index % self.colours.cpu_colour_styles.len()], - }) + ) }) .collect::<Vec<_>>(); @@ -126,7 +130,7 @@ impl CpuBasicWidget for Painter { .split(*chunk); f.render_widget( - Paragraph::new(cpu_column).block(Block::default()), + Paragraph::new(cpu_column.iter()).block(Block::default()), margined_loc[0], ); } |