Mirrors/bottom
2
0
Fork 0
mirror of https://github.com/ClementTsang/bottom synced 2024-11-10 22:54:21 +00:00
Code Issues Projects Releases Packages 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 show_avg_cpu = app_state.app_config_fields.show_average_cpu;
if draw_loc.height > 0 {
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 cpu_column = (start_index..end_index)
.map(|cpu_index| {
.map(|itx| {
Spans::from(Span {
content: (&cpu_bars[cpu_index]).into(),
style: self.colours.cpu_colour_styles
[cpu_index % self.colours.cpu_colour_styles.len()],
content: (&cpu_bars[itx]).into(),
style: if show_avg_cpu {
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<_>>();