Skip to content

Commit 715ee66

Browse files
committed
Revert "Fix CPU virtualization bar color and help text in non-detailed mode"
This reverts commit 47aeb0a.
1 parent beba3a4 commit 715ee66

2 files changed

Lines changed: 2 additions & 14 deletions

File tree

Action.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -782,8 +782,8 @@ static Htop_Reaction actionHelp(State* st) {
782782
addbartext(CRT_colors[CPU_IOWAIT], "/", "io-wait");
783783
addbartext(CRT_colors[BAR_SHADOW], " ", "used%");
784784
} else {
785-
addbartext(CRT_colors[CPU_GUEST], "/", "virt");
786-
addbartext(CRT_colors[BAR_SHADOW], " ", "used%");
785+
addbartext(CRT_colors[CPU_GUEST], "/", "guest");
786+
addbartext(CRT_colors[BAR_SHADOW], " ", "used%");
787787
}
788788
addattrstr(CRT_colors[BAR_BORDER], "]");
789789

CPUMeter.c

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -36,13 +36,6 @@ static const int CPUMeter_attributes[] = {
3636
CPU_IOWAIT
3737
};
3838

39-
static const int CPUMeter_attributes_summary[] = {
40-
CPU_NICE,
41-
CPU_NORMAL,
42-
CPU_SYSTEM,
43-
CPU_GUEST
44-
};
45-
4639
typedef struct CPUMeterData_ {
4740
unsigned int cpus;
4841
Meter** meters;
@@ -89,11 +82,6 @@ static void CPUMeter_updateValues(Meter* this) {
8982

9083
const Machine* host = this->host;
9184
const Settings* settings = host->settings;
92-
if (settings->detailedCPUTime) {
93-
this->curAttributes = CPUMeter_attributes;
94-
} else {
95-
this->curAttributes = CPUMeter_attributes_summary;
96-
}
9785

9886
unsigned int cpu = this->param;
9987
if (cpu > host->existingCPUs) {

0 commit comments

Comments
 (0)