Mercurial > mplayer.hg

changeset 37007:55f911b7217a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix PutImage() for item type itVPotmeter. Add missing code to handle it. Please note: PutImage() did never work for an itVPotmeter phase image so far.
author ib
date Fri, 28 Mar 2014 14:18:50 +0000
parents 5526b86aaa7c
children 7b4cb946634a
files gui/ui/render.c
diffstat 1 files changed, 32 insertions(+), 14 deletions(-) [+]
line wrap: on
line diff
--- a/gui/ui/render.c	Fri Mar 28 13:33:42 2014 +0000
+++ b/gui/ui/render.c	Fri Mar 28 14:18:50 2014 +0000
@@ -23,6 +23,7 @@
 
 #include "render.h"
 #include "gui/interface.h"
+#include "gui/app/gui.h"
 #include "gui/skin/font.h"
 #include "gui/util/string.h"
 
@@ -354,28 +355,45 @@
     return translation;
 }
 
-static void PutImage(int x, int y, uint32_t *drawbuf, int drawbuf_width, guiImage *img, int parts, int index)
+static void PutImage(int x, int y, uint32_t *drawbuf, int drawbuf_width, guiImage *img, int parts, int index, int below)
 {
-    int i, ix, iy;
+    register int i, iw, ic, yc;
+    register uint32_t pixel;
+    int xlimit, ylimit, ix, iy;
     uint32_t *pixels;
-    register uint32_t yc, pixel;
 
     if (!img || (img->Image == NULL))
         return;
 
-    i      = img->Width * (img->Height / parts) * index;
+    if (below) {
+        i      = img->Width * (img->Height / parts) * index;
+        xlimit = x + img->Width;
+        ylimit = y + img->Height / parts;
+    } else {
+        i      = (img->Width / parts) * index;
+        xlimit = x + img->Width / parts;
+        ylimit = y + img->Height;
+
+        iw = img->Width;
+    }
+
     pixels = (uint32_t *)img->Image;
 
     yc = y * drawbuf_width;
 
-    for (iy = y; iy < (int)(y + img->Height / parts); iy++) {
-        for (ix = x; ix < (int)(x + img->Width); ix++) {
+    for (iy = y; iy < ylimit; iy++) {
+        ic = i;
+
+        for (ix = x; ix < xlimit; ix++) {
             pixel = pixels[i++];
 
             if (!IS_TRANSPARENT(pixel))
                 drawbuf[yc + ix] = pixel;
         }
 
+        if (!below)
+            i = ic + iw;
+
         yc += drawbuf_width;
     }
 }
@@ -410,24 +428,24 @@
         switch (item->type) {
         case itButton:
 
-            PutImage(item->x, item->y, db, dw, &item->Bitmap, 3, index);
+            PutImage(item->x, item->y, db, dw, &item->Bitmap, 3, index, True);
             break;
 
         case itPimage:
 
-            PutImage(item->x, item->y, db, dw, &item->Bitmap, item->numphases, (item->numphases - 1) * (item->value / 100.0));
+            PutImage(item->x, item->y, db, dw, &item->Bitmap, item->numphases, (item->numphases - 1) * (item->value / 100.0), True);
             break;
 
         case itHPotmeter:
 
-            PutImage(item->x, item->y, db, dw, &item->Bitmap, item->numphases, (item->numphases - 1) * (item->value / 100.0));
-            PutImage(item->x + (item->width - item->pwidth) * (item->value / 100.0), item->y, db, dw, &item->Mask, 3, index);
+            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);
             break;
 
         case itVPotmeter:
 
-            PutImage(item->x, item->y, db, dw, &item->Bitmap, item->numphases, (item->numphases - 1) * (item->value / 100.0));
-            PutImage(item->x, item->y + (item->height - item->pheight) * (1.0 - item->value / 100.0), db, dw, &item->Mask, 3, index);
+            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);
             break;
 
         case itSLabel:
@@ -438,7 +456,7 @@
             image = fntTextRender(item, 0, item->label);
 
             if (image)
-                PutImage(item->x, item->y, db, dw, image, 1, 0);
+                PutImage(item->x, item->y, db, dw, image, 1, 0, True);
 
             break;
 
@@ -479,7 +497,7 @@
         }
 
             if (image)
-                PutImage(item->x, item->y, db, dw, image, 1, 0);
+                PutImage(item->x, item->y, db, dw, image, 1, 0, True);
 
             break;
         }