summaryrefslogtreecommitdiffstats
path: root/apps/gui/line.c
diff options
context:
space:
mode:
authorThomas Martitz <kugel@rockbox.org>2014-01-07 22:41:00 +0100
committerThomas Martitz <kugel@rockbox.org>2014-01-07 22:41:00 +0100
commit0e6d86e4feb800148c589faa6da4f08c41059c5d (patch)
tree0290acc14bf1a17138f20b87ae474b3990f02c97 /apps/gui/line.c
parentd146970ca1e5c9b0641301d50823d29b2e25c9e4 (diff)
downloadrockbox-0e6d86e4feb800148c589faa6da4f08c41059c5d.tar.gz
rockbox-0e6d86e4feb800148c589faa6da4f08c41059c5d.tar.bz2
rockbox-0e6d86e4feb800148c589faa6da4f08c41059c5d.zip
Fix a few reds and yellows.
Change-Id: I9ad2aca494f2ea3ca5453082ec5491ec031f9ae5
Diffstat (limited to 'apps/gui/line.c')
-rw-r--r--apps/gui/line.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/apps/gui/line.c b/apps/gui/line.c
index 3d563d171c..c0fb936f27 100644
--- a/apps/gui/line.c
+++ b/apps/gui/line.c
@@ -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);
}