summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Martitz <kugel@rockbox.org>2014-01-07 23:39:37 +0100
committerThomas Martitz <kugel@rockbox.org>2014-01-07 23:39:37 +0100
commit81be2016bbe2be5b9380e974741ac706014d0b1c (patch)
tree54e6a6362af89d4d5b407f827eb0d1b29c9cfb4c
parent4f5894de523cdc8900e3d1c2bac228383b2f5792 (diff)
downloadrockbox-81be201.tar.gz
rockbox-81be201.tar.bz2
rockbox-81be201.zip
Fix Player red and icons on mono displays.
Change-Id: Ib8adcb4c70f2dd3ddd25da8f0606f48926dfd89e
-rw-r--r--apps/gui/line.c2
-rw-r--r--firmware/export/lcd-charcell.h1
-rw-r--r--firmware/export/lcd.h17
3 files changed, 10 insertions, 10 deletions
diff --git a/apps/gui/line.c b/apps/gui/line.c
index c0fb936f27..c06fc50f26 100644
--- a/apps/gui/line.c
+++ b/apps/gui/line.c
@@ -103,7 +103,7 @@ static void put_icon(struct screen *display, int x, int y,
/* Need to change the drawmode:
* mono icons should behave like text, inverted on the selector bar
* native (colored) icons should be drawn as-is */
- if (!get_icon_format(display->screen_type) == FORMAT_MONO && (line->style & STYLE_INVERT))
+ if (get_icon_format(display->screen_type) == FORMAT_MONO && (line->style & STYLE_INVERT))
drmode = DRMODE_SOLID | DRMODE_INVERSEVID;
display->set_drawmode(drmode);
diff --git a/firmware/export/lcd-charcell.h b/firmware/export/lcd-charcell.h
index 1f61864f57..8dace07d8e 100644
--- a/firmware/export/lcd-charcell.h
+++ b/firmware/export/lcd-charcell.h
@@ -66,4 +66,3 @@ extern int xchar_info_size; /* number of entries */
extern const unsigned char xfont_fixed[][HW_PATTERN_SIZE];
void lcd_charset_init(void);
-
diff --git a/firmware/export/lcd.h b/firmware/export/lcd.h
index 00ada116c0..87476d9dda 100644
--- a/firmware/export/lcd.h
+++ b/firmware/export/lcd.h
@@ -251,6 +251,15 @@ extern void lcd_jump_scroll(int mode); /* 0=off, 1=once, ..., ALWAYS */
extern void lcd_jump_scroll_delay(int ms);
#endif /* HAVE_LCD_CHARCELLS */
+/* Bitmap formats */
+enum
+{
+ FORMAT_MONO,
+ FORMAT_NATIVE,
+ FORMAT_ANY /* For passing to read_bmp_file() */
+};
+
+
/* Draw modes */
#define DRMODE_COMPLEMENT 0
#define DRMODE_BG 1
@@ -426,14 +435,6 @@ extern bool lcd_active(void);
extern void lcd_shutdown(void);
#endif
-/* Bitmap formats */
-enum
-{
- FORMAT_MONO,
- FORMAT_NATIVE,
- FORMAT_ANY /* For passing to read_bmp_file() */
-};
-
#define FORMAT_TRANSPARENT 0x40000000
#define FORMAT_DITHER 0x20000000
#define FORMAT_REMOTE 0x10000000