tyler.durden/bottom
1
0
Fork 0
mirror of https://github.com/ClementTsang/bottom.git synced 2025-07-23 13:45:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

bug: Fixes incorrect colours being used the CPU widget in basic mode (#373)

Browse Source 
Fixes the colour order being off in basic mode, and not using the average CPU colour.
This commit is contained in:
Clement Tsang 2020-12-22 02:19:46 -05:00 committed by GitHub
parent 9d1f3c9ac2
commit 23ad597d18
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/canvas/widgets/cpu_basic.rs
View File

@ -49,6 +49,7 @@ impl CpuBasicWidget for Painter {
} }
let num_cpus = cpu_data.len(); let num_cpus = cpu_data.len();
let show_avg_cpu = app_state.app_config_fields.show_average_cpu;
if draw_loc.height > 0 { if draw_loc.height > 0 {
let remaining_height = usize::from(draw_loc.height); let remaining_height = usize::from(draw_loc.height);
@ -158,11 +159,20 @@ impl CpuBasicWidget for Painter {
let end_index = min(start_index + how_many_cpus, num_cpus); let end_index = min(start_index + how_many_cpus, num_cpus);
let cpu_column = (start_index..end_index) let cpu_column = (start_index..end_index)
.map(|cpu_index| { .map(|itx| {
Spans::from(Span { Spans::from(Span {
content: (&cpu_bars[cpu_index]).into(), content: (&cpu_bars[itx]).into(),
style: self.colours.cpu_colour_styles style: if show_avg_cpu {
[cpu_index % self.colours.cpu_colour_styles.len()], if itx == 0 {
self.colours.avg_colour_style
} else {
self.colours.cpu_colour_styles
[(itx - 1) % self.colours.cpu_colour_styles.len()]
}
} else {
self.colours.cpu_colour_styles
[(itx - 1) % self.colours.cpu_colour_styles.len()]
},
}) })
}) })
.collect::<Vec<_>>(); .collect::<Vec<_>>();