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

Make the "current line" value in the gradient style code zero-based, and an attempt at more understandable names and better comments.

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@15886 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Nicolas Pennequin 2007-12-06 17:09:24 +00:00
parent 307b8f1b95
commit 485bbbdb30
3 changed files with 21 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

8
apps/gui/list.c
View file

@ -310,7 +310,7 @@ static void gui_list_draw_smart(struct gui_list *gui_list)
}
#ifdef HAVE_LCD_COLOR
unsigned char cur_line = 1;
unsigned char cur_line = 0;
#endif
for (i = start; i < end; i++)
{
@ -379,9 +379,9 @@ static void gui_list_draw_smart(struct gui_list *gui_list)
/* Make the lcd driver know how many lines the gradient should
cover and current line number */
/* max line number*/
style |= MAXLN_PACK(gui_list->selected_size);
/* current line number */
/* number of selected lines */
style |= NUMLN_PACK(gui_list->selected_size);
/* current line number, zero based */
style |= CURLN_PACK(cur_line);
cur_line++;
}

27
firmware/drivers/lcd-16bit.c
View file

@ -553,11 +553,14 @@ void lcd_gradient_rect(int x1, int x2, int y, int h)
#define H_COLOR(lss, lse, cur_line, max_line) \
(((lse) - (lss)) * (cur_line) / (max_line) + (lss))
/* Fill a rectangle with a gradient for scrolling line */
/* Fill a rectangle with a gradient for scrolling line. To draw a gradient that
covers several lines, we need to know how many lines will be covered
(the num_lines arg), and which one is the current line within the selection
(the cur_line arg). */
void lcd_gradient_rect_scroll(int x1, int x2, int y, int h,
unsigned char max_line, unsigned char cur_line)
unsigned char num_lines, unsigned char cur_line)
{
if (h == 0 || max_line == 0) return;
if (h == 0 || num_lines == 0) return;
unsigned tmp_lss = lss_pattern;
unsigned tmp_lse = lse_pattern;
@ -568,14 +571,14 @@ void lcd_gradient_rect_scroll(int x1, int x2, int y, int h,
int lse_b = (signed)RGB_UNPACK_BLUE(lse_pattern);
int lse_g = (signed)RGB_UNPACK_GREEN(lse_pattern);
int h_r = H_COLOR(lss_r, lse_r, cur_line - 1, max_line);
int h_g = H_COLOR(lss_g, lse_g, cur_line - 1, max_line);
int h_b = H_COLOR(lss_b, lse_b, cur_line - 1, max_line);
int h_r = H_COLOR(lss_r, lse_r, cur_line, num_lines);
int h_g = H_COLOR(lss_g, lse_g, cur_line, num_lines);
int h_b = H_COLOR(lss_b, lse_b, cur_line, num_lines);
lcd_set_selector_start(LCD_RGBPACK(h_r, h_g, h_b));
int l_r = H_COLOR(lss_r, lse_r, cur_line, max_line);
int l_g = H_COLOR(lss_g, lse_g, cur_line, max_line);
int l_b = H_COLOR(lss_b, lse_b, cur_line, max_line);
int l_r = H_COLOR(lss_r, lse_r, cur_line+1, num_lines);
int l_g = H_COLOR(lss_g, lse_g, cur_line+1, num_lines);
int l_b = H_COLOR(lss_b, lse_b, cur_line+1, num_lines);
lcd_set_selector_end(LCD_RGBPACK(l_r, l_g, l_b));
lcd_gradient_rect(x1, x2, y, h);
@ -898,8 +901,8 @@ void lcd_puts_style_offset(int x, int y, const unsigned char *str, int style,
if (style & STYLE_GRADIENT) {
drawmode = DRMODE_FG;
if (CURLN_UNPACK(style) == 1)
lcd_gradient_rect(xpos, LCD_WIDTH, ypos, h*MAXLN_UNPACK(style));
if (CURLN_UNPACK(style) == 0)
lcd_gradient_rect(xpos, LCD_WIDTH, ypos, h*NUMLN_UNPACK(style));
fg_pattern = lst_pattern;
}
else if (style & STYLE_COLORBAR) {
@ -1067,7 +1070,7 @@ void lcd_scroll_fn(void)
/* Gradient line selector */
drawmode = DRMODE_FG;
lcd_gradient_rect_scroll(xpos, LCD_WIDTH, ypos, (signed)pf->height,
MAXLN_UNPACK(s->style),
NUMLN_UNPACK(s->style),
CURLN_UNPACK(s->style));
fg_pattern = lst_pattern;
break;

4
firmware/export/lcd.h
View file

@ -36,8 +36,8 @@
#define STYLE_MAXLN_MASK 0x000000FF
#define CURLN_PACK(x) (((x)<<8) & STYLE_CURLN_MASK)
#define CURLN_UNPACK(x) ((unsigned char)(((x)&STYLE_CURLN_MASK) >> 8))
#define MAXLN_PACK(x) ((x) & STYLE_MAXLN_MASK)
#define MAXLN_UNPACK(x) ((unsigned char)((x) & STYLE_MAXLN_MASK))
#define NUMLN_PACK(x) ((x) & STYLE_MAXLN_MASK)
#define NUMLN_UNPACK(x) ((unsigned char)((x) & STYLE_MAXLN_MASK))
#endif
#ifdef SIMULATOR