[MPlayer-cvslog] r37116 - in trunk/gui: app/app.h skin/skin.c ui/render.c

[ib]

Author: ib
Date: Mon Mar 31 11:44:52 2014
New Revision: 37116

Log:
Rename guiItem's members pwidth and pheight.

Add a 'b' to indicate that they refer to the potmeter button.

Modified:
   trunk/gui/app/app.h
   trunk/gui/skin/skin.c
   trunk/gui/ui/render.c

Modified: trunk/gui/app/app.h
==============================================================================
--- trunk/gui/app/app.h	Mon Mar 31 10:56:34 2014	(r37115)
+++ trunk/gui/app/app.h	Mon Mar 31 11:44:52 2014	(r37116)
@@ -129,7 +129,7 @@ typedef struct {
     int align;
     char *label;
 
-    int pwidth, pheight;
+    int pbwidth, pbheight;
     int numphases;
     float value;
 

Modified: trunk/gui/skin/skin.c
==============================================================================
--- trunk/gui/skin/skin.c	Mon Mar 31 10:56:34 2014	(r37115)
+++ trunk/gui/skin/skin.c	Mon Mar 31 11:44:52 2014	(r37116)
@@ -649,8 +649,8 @@ static int item_hpotmeter(char *in)
     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;

Modified: trunk/gui/ui/render.c
==============================================================================
--- trunk/gui/ui/render.c	Mon Mar 31 10:56:34 2014	(r37115)
+++ trunk/gui/ui/render.c	Mon Mar 31 11:44:52 2014	(r37116)
@@ -470,13 +470,13 @@ void RenderAll(wsWindow *window, guiItem
         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: