zeldon
/
htop
mirror of https://github.com/xzeldon/htop.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #247 from eworm-de/dual-meters-margin 

remove extra space in dual meters without margins
This commit is contained in:
Hisham Muhammad 2015-08-27 18:42:36 -03:00
parent f585fc9825 696e36cb45
commit f6d48c172c
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
CPUMeter.c
View File

@ -170,16 +170,17 @@ static void AllCPUsMeter_updateMode(Meter* this, int mode) {
static void DualColCPUsMeter_draw(Meter* this, int x, int y, int w) { static void DualColCPUsMeter_draw(Meter* this, int x, int y, int w) {
Meter** meters = (Meter**) this->drawData; Meter** meters = (Meter**) this->drawData;
int start, count; int start, count;
int pad = this->pl->settings->headerMargin ? 2 : 0;
AllCPUsMeter_getRange(this, &start, &count); AllCPUsMeter_getRange(this, &start, &count);
int height = (count+1)/2; int height = (count+1)/2;
int startY = y; int startY = y;
for (int i = 0; i < height; i++) { for (int i = 0; i < height; i++) {
meters[i]->draw(meters[i], x, y, (w-2)/2); meters[i]->draw(meters[i], x, y, (w-pad)/2);
y += meters[i]->h; y += meters[i]->h;
} }
y = startY; y = startY;
for (int i = height; i < count; i++) { for (int i = height; i < count; i++) {
meters[i]->draw(meters[i], x+(w-1)/2+2, y, (w-2)/2); meters[i]->draw(meters[i], x+(w-1)/2+1+(pad/2), y, (w-pad)/2);
y += meters[i]->h; y += meters[i]->h;
} }
} }