# HG changeset patch # User ib # Date 1396259092 0 # Node ID c840891d1be9a5ba07f29f97dd397f564e611ef8 # Parent ae25759bdae6211de3d29f13a0175b62e52e5685 Rename guiItem's members pwidth and pheight. Add a 'b' to indicate that they refer to the potmeter button. diff -r ae25759bdae6 -r c840891d1be9 gui/app/app.h --- a/gui/app/app.h Mon Mar 31 08:56:34 2014 +0000 +++ b/gui/app/app.h Mon Mar 31 09:44:52 2014 +0000 @@ -129,7 +129,7 @@ int align; char *label; - int pwidth, pheight; + int pbwidth, pbheight; int numphases; float value; diff -r ae25759bdae6 -r c840891d1be9 gui/skin/skin.c --- a/gui/skin/skin.c Mon Mar 31 08:56:34 2014 +0000 +++ b/gui/skin/skin.c Mon Mar 31 09:44:52 2014 +0000 @@ -649,8 +649,8 @@ item->y = y; item->width = w; item->height = h; - item->pwidth = bwidth; - item->pheight = bheight; + item->pbwidth = bwidth; + item->pbheight = bheight; item->numphases = num; item->value = (float)d; item->message = message; diff -r ae25759bdae6 -r c840891d1be9 gui/ui/render.c --- a/gui/ui/render.c Mon Mar 31 08:56:34 2014 +0000 +++ b/gui/ui/render.c Mon Mar 31 09:44:52 2014 +0000 @@ -470,13 +470,13 @@ case itHPotmeter: PutImage(item->x, item->y, db, dw, &item->Bitmap, item->numphases, (item->numphases - 1) * item->value / 100.0, True); - PutImage(item->x + (item->width - item->pwidth) * item->value / 100.0, item->y, db, dw, &item->Mask, 3, index, True); + PutImage(item->x + (item->width - item->pbwidth) * item->value / 100.0, item->y, db, dw, &item->Mask, 3, index, True); break; case itVPotmeter: PutImage(item->x, item->y, db, dw, &item->Bitmap, item->numphases, (item->numphases - 1) * item->value / 100.0, False); - PutImage(item->x, item->y + (item->height - item->pheight) * (1.0 - item->value / 100.0), db, dw, &item->Mask, 3, index, True); + PutImage(item->x, item->y + (item->height - item->pbheight) * (1.0 - item->value / 100.0), db, dw, &item->Mask, 3, index, True); break; case itSLabel: