Commit f6d48c17 authored by Hisham Muhammad's avatar Hisham Muhammad
Browse files

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

remove extra space in dual meters without margins
parents f585fc98 696e36cb
...@@ -170,16 +170,17 @@ static void AllCPUsMeter_updateMode(Meter* this, int mode) { ...@@ -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;
} }
} }
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment