correct drawing of the bar type tags when nofill is set.

draw the slider bitmap before drawing A-B repeat markers so that they are visible.


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

1 files changed, 9 insertions, 3 deletions

diff --git a/apps/gui/scrollbar.c b/apps/gui/scrollbar.c
index 8f431a4ff8..17d280b1ca 100644
--- a/apps/gui/scrollbar.c
+++ b/apps/gui/scrollbar.c
@@ -151,6 +151,9 @@ void gui_scrollbar_draw(struct screen * screen, int x, int y,
 
     screen->set_drawmode(DRMODE_SOLID);
 
+    if (flags & INNER_NOFILL)
+        return;
+
 #ifdef HAVE_LCD_COLOR
     if (infill == INNER_BGFILL)
     {
@@ -190,7 +193,12 @@ void gui_bitmap_scrollbar_draw(struct screen * screen, struct bitmap *bm, int x,
 
     /* clear pixels in progress bar */
     screen->fillrect(x, y, width, height);
-    
+
+    screen->set_drawmode(DRMODE_SOLID);
+
+    if (flags & INNER_NOFILL)
+        return;
+
     if (flags & INVERTFILL)
     {
         min_shown = items - max_shown;
@@ -204,8 +212,6 @@ void gui_bitmap_scrollbar_draw(struct screen * screen, struct bitmap *bm, int x,
 
     scrollbar_helper(min_shown, max_shown, items, inner_len, &size, &start);
 
-    screen->set_drawmode(DRMODE_SOLID);
-
     if (flags & HORIZONTAL) {
         x += start;
         width = size;