summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xapps/bitmaps/native/default_icons.6x8x16.bmpbin5174 -> 5174 bytes
-rw-r--r--apps/plugins/bitmaps/viewer_defaults/viewers.6x8x16.bmpbin2134 -> 2134 bytes
-rw-r--r--firmware/drivers/lcd-16bit.c4
-rw-r--r--firmware/export/lcd.h1
4 files changed, 4 insertions, 1 deletions
diff --git a/apps/bitmaps/native/default_icons.6x8x16.bmp b/apps/bitmaps/native/default_icons.6x8x16.bmp
index 601c4f95a6..8cc45c7855 100755
--- a/apps/bitmaps/native/default_icons.6x8x16.bmp
+++ b/apps/bitmaps/native/default_icons.6x8x16.bmp
Binary files differ
diff --git a/apps/plugins/bitmaps/viewer_defaults/viewers.6x8x16.bmp b/apps/plugins/bitmaps/viewer_defaults/viewers.6x8x16.bmp
index 1760e66d43..9b039b1217 100644
--- a/apps/plugins/bitmaps/viewer_defaults/viewers.6x8x16.bmp
+++ b/apps/plugins/bitmaps/viewer_defaults/viewers.6x8x16.bmp
Binary files differ
diff --git a/firmware/drivers/lcd-16bit.c b/firmware/drivers/lcd-16bit.c
index f03cab3877..73e901f583 100644
--- a/firmware/drivers/lcd-16bit.c
+++ b/firmware/drivers/lcd-16bit.c
@@ -727,7 +727,9 @@ void lcd_bitmap_transparent_part(const fb_data *src, int src_x, int src_y,
727 int i; 727 int i;
728 for(i = 0;i < width;i++) 728 for(i = 0;i < width;i++)
729 { 729 {
730 if(src[i] != TRANSPARENT_COLOR) 730 if (src[i] == REPLACEWITHFG_COLOR)
731 dst[i] = fg_pattern;
732 else if(src[i] != TRANSPARENT_COLOR)
731 dst[i] = src[i]; 733 dst[i] = src[i];
732 } 734 }
733 src += stride; 735 src += stride;
diff --git a/firmware/export/lcd.h b/firmware/export/lcd.h
index 787eea01f5..d379dc3613 100644
--- a/firmware/export/lcd.h
+++ b/firmware/export/lcd.h
@@ -291,6 +291,7 @@ enum
291#define FORMAT_REMOTE 0x10000000 291#define FORMAT_REMOTE 0x10000000
292 292
293#define TRANSPARENT_COLOR LCD_RGBPACK(255,0,255) 293#define TRANSPARENT_COLOR LCD_RGBPACK(255,0,255)
294#define REPLACEWITHFG_COLOR LCD_RGBPACK(0,255,255)
294 295
295struct bitmap { 296struct bitmap {
296 int width; 297 int width;