Nyaaori/rockbox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix a few reds and yellows.

Browse source 
Change-Id: I9ad2aca494f2ea3ca5453082ec5491ec031f9ae5
This commit is contained in:
Thomas Martitz 2014-01-07 22:41:00 +01:00
parent d146970ca1
commit 0e6d86e4fe
2 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
apps/gui/line.c
View file

@ -31,6 +31,7 @@
#include "screens.h"
#include "settings.h"
#include "debug.h"
#include "viewport.h"
#ifdef HAVE_REMOTE_LCD
#define MAX_LINES (LCD_SCROLLABLE_LINES + LCD_REMOTE_SCROLLABLE_LINES)
@ -278,7 +279,7 @@ static void style_line(struct screen *display,
switch (style & _STYLE_DECO_MASK)
{
#if (LCD_DEPTH > 1 || (defined(LCD_REMOTE_DEPTH) && LCD_REMOTE_DEPTH > 1))
#ifdef HAVE_LCD_COLOR
case STYLE_GRADIENT:
display->set_drawmode(DRMODE_FG);
display->gradient_fillrect_part(x, y, width, height,
@ -318,7 +319,7 @@ static void style_line(struct screen *display,
else if (style & (STYLE_GRADIENT|STYLE_COLORBAR))
display->set_foreground(line->text_color);
else
display->set_foreground(global_settings.fg_color);
display->set_foreground(get_viewport_default_colour(display->screen_type, true));
}
#endif
}
@ -332,7 +333,7 @@ void vput_line(struct screen *display,
print_line(display, x, y, line, fmt, ap);
#if (LCD_DEPTH > 1 || (defined(LCD_REMOTE_DEPTH) && LCD_REMOTE_DEPTH > 1))
if (display->depth > 1)
display->set_foreground(global_settings.fg_color);
display->set_foreground(get_viewport_default_colour(display->screen_type, true));
#endif
display->set_drawmode(DRMODE_SOLID);
}

3
apps/gui/skin_engine/skin_render.c
View file

@ -105,7 +105,6 @@ static bool do_non_text_tags(struct gui_wps *gwps, struct skin_draw_info *info,
#ifdef HAVE_LCD_BITMAP
struct wps_data *data = gwps->data;
bool do_refresh = (element->tag->flags & info->refresh_type) > 0;
struct line_desc *linedes = &info->line_desc;
#endif
switch (token->type)
{
@ -132,6 +131,7 @@ static bool do_non_text_tags(struct gui_wps *gwps, struct skin_draw_info *info,
* come before the text style tag color fields need to be preserved */
if (data->style & STYLE_GRADIENT)
{
struct line_desc *linedes = &info->line_desc;
fb_data tc = linedes->text_color,
lc = linedes->line_color,
lec = linedes->line_end_color;
@ -149,6 +149,7 @@ static bool do_non_text_tags(struct gui_wps *gwps, struct skin_draw_info *info,
case SKIN_TOKEN_VIEWPORT_GRADIENT_SETUP:
{
struct gradient_config *cfg = SKINOFFSETTOPTR(skin_buffer, token->value.data);
struct line_desc *linedes = &info->line_desc;
linedes->text_color = cfg->text;
linedes->line_color = cfg->start;
linedes->line_end_color = cfg->end;