Make the gradient look better when more than one line is selected (running time, ID3 info, cuesheet viewer...). I haven't found a solution for scrolling yet, so that won't look too good.

The recording screen code needs a bit of adapting too, but I don't have a target to test on, so leave it for now.


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

3 files changed, 9 insertions, 2 deletions

diff --git a/apps/gui/list.c b/apps/gui/list.c
index 6a7d21cc4b..aca0105967 100644
--- a/apps/gui/list.c
+++ b/apps/gui/list.c
@@ -409,6 +409,11 @@ static void gui_list_draw_smart(struct gui_list *gui_list)
             {
                 /* Display gradient line selector */
                 style |= STYLE_GRADIENT;
+
+                /* Make the lcd driver know how many lines the gradient should
+                   cover and only draw it for the first selected item. */
+                if (current_item == gui_list->selected_item)
+                    style |= gui_list->selected_size & STYLE_COLOR_MASK;
             }
 #endif
             else  /*  if (!global_settings.cursor_style) */
diff --git a/apps/recorder/recording.c b/apps/recorder/recording.c
index bd04d26929..fed2e6767e 100644
--- a/apps/recorder/recording.c
+++ b/apps/recorder/recording.c
@@ -863,7 +863,7 @@ bool recording_screen(bool no_source)
         style |= STYLE_COLORBAR;
     }
     else if (global_settings.cursor_style == 3) {
-        style |= STYLE_GRADIENT;
+        style |= STYLE_GRADIENT | 1;
     }
 #endif
 
diff --git a/firmware/drivers/lcd-16bit.c b/firmware/drivers/lcd-16bit.c
index 2d228b6566..f748b4027c 100644
--- a/firmware/drivers/lcd-16bit.c
+++ b/firmware/drivers/lcd-16bit.c
@@ -529,6 +529,8 @@ void lcd_fillrect(int x, int y, int width, int height)
 /* Fill a rectangle with a gradient */
 void lcd_gradient_rect(int x1, int x2, int y, int h)
 {
+    if (h == 0) return;
+
     int h_r = RGB_UNPACK_RED(lss_pattern) << 16;
     int h_b = RGB_UNPACK_BLUE(lss_pattern) << 16;
     int h_g = RGB_UNPACK_GREEN(lss_pattern) << 16;
@@ -861,7 +863,7 @@ void lcd_puts_style_offset(int x, int y, const unsigned char *str, int style,
 
     if (style & STYLE_GRADIENT) {
         drawmode = DRMODE_FG;
-        lcd_gradient_rect(xpos, LCD_WIDTH, ypos, h);
+        lcd_gradient_rect(xpos, LCD_WIDTH, ypos, h*(style & STYLE_COLOR_MASK));
         fg_pattern = lst_pattern;
     }
     else if (style & STYLE_COLORBAR) {