summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-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,
103 /* Need to change the drawmode: 103 /* Need to change the drawmode:
104 * mono icons should behave like text, inverted on the selector bar 104 * mono icons should behave like text, inverted on the selector bar
105 * native (colored) icons should be drawn as-is */ 105 * native (colored) icons should be drawn as-is */
106 if (!get_icon_format(display->screen_type) == FORMAT_MONO && (line->style & STYLE_INVERT)) 106 if (get_icon_format(display->screen_type) == FORMAT_MONO && (line->style & STYLE_INVERT))
107 drmode = DRMODE_SOLID | DRMODE_INVERSEVID; 107 drmode = DRMODE_SOLID | DRMODE_INVERSEVID;
108 108
109 display->set_drawmode(drmode); 109 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 */
66extern const unsigned char xfont_fixed[][HW_PATTERN_SIZE]; 66extern const unsigned char xfont_fixed[][HW_PATTERN_SIZE];
67 67
68void lcd_charset_init(void); 68void lcd_charset_init(void);
69
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 */
251extern void lcd_jump_scroll_delay(int ms); 251extern void lcd_jump_scroll_delay(int ms);
252#endif /* HAVE_LCD_CHARCELLS */ 252#endif /* HAVE_LCD_CHARCELLS */
253 253
254/* Bitmap formats */
255enum
256{
257 FORMAT_MONO,
258 FORMAT_NATIVE,
259 FORMAT_ANY /* For passing to read_bmp_file() */
260};
261
262
254/* Draw modes */ 263/* Draw modes */
255#define DRMODE_COMPLEMENT 0 264#define DRMODE_COMPLEMENT 0
256#define DRMODE_BG 1 265#define DRMODE_BG 1
@@ -426,14 +435,6 @@ extern bool lcd_active(void);
426extern void lcd_shutdown(void); 435extern void lcd_shutdown(void);
427#endif 436#endif
428 437
429/* Bitmap formats */
430enum
431{
432 FORMAT_MONO,
433 FORMAT_NATIVE,
434 FORMAT_ANY /* For passing to read_bmp_file() */
435};
436
437#define FORMAT_TRANSPARENT 0x40000000 438#define FORMAT_TRANSPARENT 0x40000000
438#define FORMAT_DITHER 0x20000000 439#define FORMAT_DITHER 0x20000000
439#define FORMAT_REMOTE 0x10000000 440#define FORMAT_REMOTE 0x10000000