Fix Player red and icons on mono displays.

Change-Id: Ib8adcb4c70f2dd3ddd25da8f0606f48926dfd89e

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);

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);
-

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