Fix Player red and icons on mono displays.

Change-Id: Ib8adcb4c70f2dd3ddd25da8f0606f48926dfd89e
This commit is contained in:
Thomas Martitz 2014-01-07 23:39:37 +01:00
parent 4f5894de52
commit 81be2016bb
3 changed files with 10 additions and 10 deletions

View file

@ -103,7 +103,7 @@ static void put_icon(struct screen *display, int x, int y,
/* Need to change the drawmode: /* Need to change the drawmode:
* mono icons should behave like text, inverted on the selector bar * mono icons should behave like text, inverted on the selector bar
* native (colored) icons should be drawn as-is */ * 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; drmode = DRMODE_SOLID | DRMODE_INVERSEVID;
display->set_drawmode(drmode); display->set_drawmode(drmode);

View file

@ -66,4 +66,3 @@ extern int xchar_info_size; /* number of entries */
extern const unsigned char xfont_fixed[][HW_PATTERN_SIZE]; extern const unsigned char xfont_fixed[][HW_PATTERN_SIZE];
void lcd_charset_init(void); void lcd_charset_init(void);

View file

@ -251,6 +251,15 @@ extern void lcd_jump_scroll(int mode); /* 0=off, 1=once, ..., ALWAYS */
extern void lcd_jump_scroll_delay(int ms); extern void lcd_jump_scroll_delay(int ms);
#endif /* HAVE_LCD_CHARCELLS */ #endif /* HAVE_LCD_CHARCELLS */
/* Bitmap formats */
enum
{
FORMAT_MONO,
FORMAT_NATIVE,
FORMAT_ANY /* For passing to read_bmp_file() */
};
/* Draw modes */ /* Draw modes */
#define DRMODE_COMPLEMENT 0 #define DRMODE_COMPLEMENT 0
#define DRMODE_BG 1 #define DRMODE_BG 1
@ -426,14 +435,6 @@ extern bool lcd_active(void);
extern void lcd_shutdown(void); extern void lcd_shutdown(void);
#endif #endif
/* Bitmap formats */
enum
{
FORMAT_MONO,
FORMAT_NATIVE,
FORMAT_ANY /* For passing to read_bmp_file() */
};
#define FORMAT_TRANSPARENT 0x40000000 #define FORMAT_TRANSPARENT 0x40000000
#define FORMAT_DITHER 0x20000000 #define FORMAT_DITHER 0x20000000
#define FORMAT_REMOTE 0x10000000 #define FORMAT_REMOTE 0x10000000