A bunch of new features for the bar type tags (%pb, %pv, %bl, etc):

* the bar orientation (horiz/vert) is now chosen based on the width and heigt values (or can be forced).
* the fill direction can now be inverted (fill right to left, or top to bottom is considered inverted)
* It can now draw a slider type bar instead of a fill type (or indeed a slider with a fill type)

To configure the new bar, any (or all) of the following params can be used after the bmp filename (order makes no difference either):
invert - cause the bar to fill in the inverted direction
vertical - draw a vertical bar (not needed if the height > width)
horizontal - draw a horizontal bar (this is obviously the default)
nofill - dont draw the filling bar (this still draws the outline, obviously pointless without the slider param)
slider - draw an image for the slider. The next param MUST be the label of the image to draw. No option to use a subimage here, so the whole image needs to be the image you want on the slider. 

example: %pb(0,0,-,-,-,nofill, slider, slider_image, invert) - draw a boring horizontal progressbar which doesnt fill and only draws the image "slider_image" which moves right to left.

the slider type might need some tweaking. let us know how it goes


git-svn-id: svn://svn.rockbox.org/rockbox/trunk@27821 a1c6a512-1295-4272-9138-f99709370657

1 files changed, 19 insertions, 2 deletions

diff --git a/apps/gui/scrollbar.c b/apps/gui/scrollbar.c
index 317c55cdc7..8f431a4ff8 100644
--- a/apps/gui/scrollbar.c
+++ b/apps/gui/scrollbar.c
@@ -88,6 +88,12 @@ void gui_scrollbar_draw(struct screen * screen, int x, int y,
     int infill;
 #endif
 
+    if (flags & INVERTFILL)
+    {
+        min_shown = items - max_shown;
+        max_shown = items;
+    }
+
     inner_x  = x + 1;
     inner_y  = y + 1;
     inner_wd = width  - 2;
@@ -178,11 +184,18 @@ void gui_bitmap_scrollbar_draw(struct screen * screen, struct bitmap *bm, int x,
     int start;
     int size;
     int inner_len;
+    int startx = 0, starty = 0;
 
     screen->set_drawmode(DRMODE_SOLID|DRMODE_INVERSEVID);
 
     /* clear pixels in progress bar */
     screen->fillrect(x, y, width, height);
+    
+    if (flags & INVERTFILL)
+    {
+        min_shown = items - max_shown;
+        max_shown = items;
+    }
 
     if (flags & HORIZONTAL)
         inner_len = width;
@@ -196,19 +209,23 @@ void gui_bitmap_scrollbar_draw(struct screen * screen, struct bitmap *bm, int x,
     if (flags & HORIZONTAL) {
         x += start;
         width = size;
+        if (flags & INVERTFILL)
+            startx = start;
     } else {
         y += start;
         height = size;
+        if (flags & INVERTFILL)
+            starty = start;
     }
 
 #if LCD_DEPTH > 1
     if (bm->format == FORMAT_MONO)
 #endif
-        screen->mono_bitmap_part(bm->data, 0, 0,
+        screen->mono_bitmap_part(bm->data, startx, starty,
                                  bm->width, x, y, width, height);
 #if LCD_DEPTH > 1
     else
-        screen->transparent_bitmap_part((fb_data *)bm->data, 0, 0,
+        screen->transparent_bitmap_part((fb_data *)bm->data, startx, starty,
                                         STRIDE(screen->screen_type, 
                                             bm->width, bm->height), 
                                         x, y, width, height);