devs/foxbox
1
0
Fork 0
forked from len0rd/rockbox
Code Pull requests Activity

Fix FS#11651 - slider wasnt being drawn correctly with inverted (and vertical) bars

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@28207 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Jonathan Gordon 2010-10-04 13:20:37 +00:00
parent efbcece07b
commit dd6b1dc5d2
1 changed files with 19 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

24
apps/gui/skin_engine/skin_display.c
View file

@ -181,7 +181,7 @@ void draw_progressbar(struct gui_wps *gwps, int line, struct progressbar *pb)
if (!pb->horizontal) if (!pb->horizontal)
{ {
/* we want to fill upwards which is technically inverted. */ /* we want to fill upwards which is technically inverted. */
flags = VERTICAL|INVERTFILL; flags = INVERTFILL;
} }
if (pb->invert_fill_direction) if (pb->invert_fill_direction)
@ -209,15 +209,29 @@ void draw_progressbar(struct gui_wps *gwps, int line, struct progressbar *pb)
int height = pb->height; int height = pb->height;
struct gui_img *img = pb->slider; struct gui_img *img = pb->slider;
if (flags&VERTICAL) if ((flags&HORIZONTAL) == 0)
{ {
y += pb->height*end/length;
height = img->bm.height; height = img->bm.height;
if (flags&INVERTFILL)
y += pb->height - pb->height*end/length;
else
y += pb->height*end/length;
#if 0 /* maybe add this in later, make the slider bmp overlap abit */
if ((flags&INNER_NOFILL) == 0)
y -= img->bm.height/2;
#endif
} }
else else
{ {
x += pb->width*end/length; width = img->bm.width;
width = img->bm.width; if (flags&INVERTFILL)
x += pb->width - pb->width*end/length;
else
x += pb->width*end/length;
#if 0 /* maybe add this in later, make the slider bmp overlap abit */
if ((flags&INNER_NOFILL) == 0)
x -= img->bm.width/2;
#endif
} }
#if LCD_DEPTH > 1 #if LCD_DEPTH > 1
if(img->bm.format == FORMAT_MONO) { if(img->bm.format == FORMAT_MONO) {