From 00434be0f129eb72e3a0bd99deed2923c760cd5e Mon Sep 17 00:00:00 2001 From: Thomas Martitz Date: Mon, 3 Mar 2014 16:17:27 +0100 Subject: Fix greyscale and mono builds. Change-Id: I511376eb42d1109dbe10d4fc5aa849b21d9f7582 --- apps/gui/line.c | 4 ++-- apps/settings_list.c | 5 ++++- 2 files changed, 6 insertions(+), 3 deletions(-) (limited to 'apps') 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, { int sep_height = MIN(line->separator_height, height); display->set_drawmode(DRMODE_FG); -#if LCD_DEPTH > 1 +#ifdef HAVE_LCD_COLOR display->set_foreground(global_settings.list_separator_color); #endif display->fillrect(x, y + height - sep_height, width, sep_height); bar_height -= sep_height; -#if LCD_DEPTH > 1 +#ifdef HAVE_LCD_COLOR display->set_foreground(global_settings.fg_color); #endif } 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"; #define DEFAULT_TAGCACHE_SCAN_PATHS "/" #endif - +#if LCD_DEPTH > 1 static const char* list_pad_formatter(char *buffer, size_t buffer_size, 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); } } +#endif static const char* formatter_unit_0_is_off(char *buffer, size_t buffer_size, int val, const char *unit) @@ -914,9 +915,11 @@ const struct settings_list settings[] = { 0, "list separator height", "auto,off", UNIT_PIXEL, list_pad_formatter, list_pad_getlang, NULL, 15, -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, INT(DEFAULT_THEME_SEPARATOR),"list separator color",NULL,UNUSED}, #endif +#endif #if CONFIG_KEYPAD == RECORDER_PAD OFFON_SETTING(F_THEMESETTING,buttonbar, LANG_BUTTON_BAR ,true,"buttonbar", NULL), #endif -- cgit v1.2.3