1
0
Fork 0
forked from len0rd/rockbox

Fix greyscale and mono builds.

Change-Id: I511376eb42d1109dbe10d4fc5aa849b21d9f7582
This commit is contained in:
Thomas Martitz 2014-03-03 16:17:27 +01:00
parent 05a67d021c
commit 00434be0f1
2 changed files with 6 additions and 3 deletions

View file

@ -318,12 +318,12 @@ static void style_line(struct screen *display,
{ {
int sep_height = MIN(line->separator_height, height); int sep_height = MIN(line->separator_height, height);
display->set_drawmode(DRMODE_FG); display->set_drawmode(DRMODE_FG);
#if LCD_DEPTH > 1 #ifdef HAVE_LCD_COLOR
display->set_foreground(global_settings.list_separator_color); display->set_foreground(global_settings.list_separator_color);
#endif #endif
display->fillrect(x, y + height - sep_height, width, sep_height); display->fillrect(x, y + height - sep_height, width, sep_height);
bar_height -= sep_height; bar_height -= sep_height;
#if LCD_DEPTH > 1 #ifdef HAVE_LCD_COLOR
display->set_foreground(global_settings.fg_color); display->set_foreground(global_settings.fg_color);
#endif #endif
} }

View file

@ -324,7 +324,7 @@ static const char graphic_numeric[] = "graphic,numeric";
#define DEFAULT_TAGCACHE_SCAN_PATHS "/" #define DEFAULT_TAGCACHE_SCAN_PATHS "/"
#endif #endif
#if LCD_DEPTH > 1
static const char* list_pad_formatter(char *buffer, size_t buffer_size, static const char* list_pad_formatter(char *buffer, size_t buffer_size,
int val, const char *unit) int val, const char *unit)
{ {
@ -347,6 +347,7 @@ static int32_t list_pad_getlang(int value, int unit)
default: return TALK_ID(value, unit); default: return TALK_ID(value, unit);
} }
} }
#endif
static const char* formatter_unit_0_is_off(char *buffer, size_t buffer_size, static const char* formatter_unit_0_is_off(char *buffer, size_t buffer_size,
int val, const char *unit) int val, const char *unit)
@ -914,9 +915,11 @@ const struct settings_list settings[] = {
0, "list separator height", "auto,off", UNIT_PIXEL, 0, "list separator height", "auto,off", UNIT_PIXEL,
list_pad_formatter, list_pad_getlang, NULL, 15, list_pad_formatter, list_pad_getlang, NULL, 15,
-1,0,1,2,3,4,5,7,9,11,13,16,20,25,30), -1,0,1,2,3,4,5,7,9,11,13,16,20,25,30),
#ifdef HAVE_LCD_COLOR
{F_T_INT|F_RGB|F_THEMESETTING ,&global_settings.list_separator_color,-1, {F_T_INT|F_RGB|F_THEMESETTING ,&global_settings.list_separator_color,-1,
INT(DEFAULT_THEME_SEPARATOR),"list separator color",NULL,UNUSED}, INT(DEFAULT_THEME_SEPARATOR),"list separator color",NULL,UNUSED},
#endif #endif
#endif
#if CONFIG_KEYPAD == RECORDER_PAD #if CONFIG_KEYPAD == RECORDER_PAD
OFFON_SETTING(F_THEMESETTING,buttonbar, LANG_BUTTON_BAR ,true,"buttonbar", NULL), OFFON_SETTING(F_THEMESETTING,buttonbar, LANG_BUTTON_BAR ,true,"buttonbar", NULL),
#endif #endif