Mercurial > mplayer.hg

changeset 37020:c840891d1be9

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Rename guiItem's members pwidth and pheight. Add a 'b' to indicate that they refer to the potmeter button.
author ib
date Mon, 31 Mar 2014 09:44:52 +0000
parents ae25759bdae6
children 9d186448b5d7
files gui/app/app.h gui/skin/skin.c gui/ui/render.c
diffstat 3 files changed, 5 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- 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;
 
--- 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;
--- 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: