summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Martitz <kugel@rockbox.org>2014-03-03 16:17:27 +0100
committerThomas Martitz <kugel@rockbox.org>2014-03-03 16:34:36 +0100
commit00434be0f129eb72e3a0bd99deed2923c760cd5e (patch)
treea9c0332dd6d5b8b1e5ce6489e9c1e9e6000da447
parent05a67d021c8fbb10b2654f8378b549901dd4c520 (diff)
downloadrockbox-00434be0f129eb72e3a0bd99deed2923c760cd5e.tar.gz
rockbox-00434be0f129eb72e3a0bd99deed2923c760cd5e.zip
Fix greyscale and mono builds.
Change-Id: I511376eb42d1109dbe10d4fc5aa849b21d9f7582
-rw-r--r--apps/gui/line.c4
-rw-r--r--apps/settings_list.c5
2 files changed, 6 insertions, 3 deletions
diff --git a/apps/gui/line.c b/apps/gui/line.c
index 4a51c6e307..2b1bec2c6b 100644
--- a/apps/gui/line.c
+++ b/apps/gui/line.c
@@ -318,12 +318,12 @@ static void style_line(struct screen *display,
318 { 318 {
319 int sep_height = MIN(line->separator_height, height); 319 int sep_height = MIN(line->separator_height, height);
320 display->set_drawmode(DRMODE_FG); 320 display->set_drawmode(DRMODE_FG);
321#if LCD_DEPTH > 1 321#ifdef HAVE_LCD_COLOR
322 display->set_foreground(global_settings.list_separator_color); 322 display->set_foreground(global_settings.list_separator_color);
323#endif 323#endif
324 display->fillrect(x, y + height - sep_height, width, sep_height); 324 display->fillrect(x, y + height - sep_height, width, sep_height);
325 bar_height -= sep_height; 325 bar_height -= sep_height;
326#if LCD_DEPTH > 1 326#ifdef HAVE_LCD_COLOR
327 display->set_foreground(global_settings.fg_color); 327 display->set_foreground(global_settings.fg_color);
328#endif 328#endif
329 } 329 }
diff --git a/apps/settings_list.c b/apps/settings_list.c
index 681a3ab05b..39258dff8f 100644
--- a/apps/settings_list.c
+++ b/apps/settings_list.c
@@ -324,7 +324,7 @@ static const char graphic_numeric[] = "graphic,numeric";
324#define DEFAULT_TAGCACHE_SCAN_PATHS "/" 324#define DEFAULT_TAGCACHE_SCAN_PATHS "/"
325#endif 325#endif
326 326
327 327#if LCD_DEPTH > 1
328static const char* list_pad_formatter(char *buffer, size_t buffer_size, 328static const char* list_pad_formatter(char *buffer, size_t buffer_size,
329 int val, const char *unit) 329 int val, const char *unit)
330{ 330{
@@ -347,6 +347,7 @@ static int32_t list_pad_getlang(int value, int unit)
347 default: return TALK_ID(value, unit); 347 default: return TALK_ID(value, unit);
348 } 348 }
349} 349}
350#endif
350 351
351static const char* formatter_unit_0_is_off(char *buffer, size_t buffer_size, 352static const char* formatter_unit_0_is_off(char *buffer, size_t buffer_size,
352 int val, const char *unit) 353 int val, const char *unit)
@@ -914,9 +915,11 @@ const struct settings_list settings[] = {
914 0, "list separator height", "auto,off", UNIT_PIXEL, 915 0, "list separator height", "auto,off", UNIT_PIXEL,
915 list_pad_formatter, list_pad_getlang, NULL, 15, 916 list_pad_formatter, list_pad_getlang, NULL, 15,
916 -1,0,1,2,3,4,5,7,9,11,13,16,20,25,30), 917 -1,0,1,2,3,4,5,7,9,11,13,16,20,25,30),
918#ifdef HAVE_LCD_COLOR
917 {F_T_INT|F_RGB|F_THEMESETTING ,&global_settings.list_separator_color,-1, 919 {F_T_INT|F_RGB|F_THEMESETTING ,&global_settings.list_separator_color,-1,
918 INT(DEFAULT_THEME_SEPARATOR),"list separator color",NULL,UNUSED}, 920 INT(DEFAULT_THEME_SEPARATOR),"list separator color",NULL,UNUSED},
919#endif 921#endif
922#endif
920#if CONFIG_KEYPAD == RECORDER_PAD 923#if CONFIG_KEYPAD == RECORDER_PAD
921 OFFON_SETTING(F_THEMESETTING,buttonbar, LANG_BUTTON_BAR ,true,"buttonbar", NULL), 924 OFFON_SETTING(F_THEMESETTING,buttonbar, LANG_BUTTON_BAR ,true,"buttonbar", NULL),
922#endif 925#endif