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

put_line: Be more careful with changing fg and bg colors.

Browse source 
put_line() needs to change fore- and background colors if required by
the line style. This should really only be done if required, and be undone
as to not compromise subsequent lines. This fixes %Vf and %Vb skin tags.

Change-Id: I85e5a0d1d64aa9eb76a891d9ce1de1320274a69a
This commit is contained in:
Thomas Martitz 2014-01-09 17:42:47 +01:00
parent fde92de224
commit 3be3a40138
1 changed files with 16 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

21
apps/gui/line.c
View file

@ -306,7 +306,8 @@ static void style_line(struct screen *display,
break; break;
} }
#if (LCD_DEPTH > 1 || (defined(LCD_REMOTE_DEPTH) && LCD_REMOTE_DEPTH > 1)) #if (LCD_DEPTH > 1 || (defined(LCD_REMOTE_DEPTH) && LCD_REMOTE_DEPTH > 1))
/* fg color and bg color are left as-is for text drawing */ /* prepare fg and bg colors for text drawing, be careful to not
* override any previously set colors unless mandated by the style */
if (display->depth > 1) if (display->depth > 1)
{ {
if (style & STYLE_COLORED) if (style & STYLE_COLORED)
@ -318,8 +319,6 @@ static void style_line(struct screen *display,
} }
else if (style & (STYLE_GRADIENT|STYLE_COLORBAR)) else if (style & (STYLE_GRADIENT|STYLE_COLORBAR))
display->set_foreground(line->text_color); display->set_foreground(line->text_color);
else
display->set_foreground(get_viewport_default_colour(display->screen_type, true));
} }
#endif #endif
} }
@ -329,11 +328,23 @@ void vput_line(struct screen *display,
int x, int y, struct line_desc *line, int x, int y, struct line_desc *line,
const char *fmt, va_list ap) const char *fmt, va_list ap)
{ {
#if (LCD_DEPTH > 1 || (defined(LCD_REMOTE_DEPTH) && LCD_REMOTE_DEPTH > 1))
/* push and pop fg and bg colors as to not compromise unrelated lines */
unsigned fg = 0, bg = 0; /* shut up gcc */
if (display->depth > 1 && line->style > STYLE_INVERT)
{
fg = display->get_foreground();
bg = display->get_background();
}
#endif
style_line(display, x, y, line); style_line(display, x, y, line);
print_line(display, x, y, line, fmt, ap); print_line(display, x, y, line, fmt, ap);
#if (LCD_DEPTH > 1 || (defined(LCD_REMOTE_DEPTH) && LCD_REMOTE_DEPTH > 1)) #if (LCD_DEPTH > 1 || (defined(LCD_REMOTE_DEPTH) && LCD_REMOTE_DEPTH > 1))
if (display->depth > 1) if (display->depth > 1 && line->style > STYLE_INVERT)
display->set_foreground(get_viewport_default_colour(display->screen_type, true)); {
display->set_foreground(fg);
display->set_background(bg);
}
#endif #endif
display->set_drawmode(DRMODE_SOLID); display->set_drawmode(DRMODE_SOLID);
} }