summaryrefslogtreecommitdiff
path: root/apps/gui
diff options
context:
space:
mode:
Diffstat (limited to 'apps/gui')
-rw-r--r--apps/gui/icon.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/apps/gui/icon.c b/apps/gui/icon.c
index 2efaed9698..8957a5a282 100644
--- a/apps/gui/icon.c
+++ b/apps/gui/icon.c
@@ -194,6 +194,7 @@ static void load_icons(const char* filename, enum Iconset iconset,
194 int size_read; 194 int size_read;
195 bool *loaded_ok = NULL; 195 bool *loaded_ok = NULL;
196 struct bitmap *bmp = NULL; 196 struct bitmap *bmp = NULL;
197 int bmpformat = (FORMAT_NATIVE|FORMAT_DITHER);
197 198
198 if (!(*filename)) 199 if (!(*filename))
199 { 200 {
@@ -217,11 +218,13 @@ static void load_icons(const char* filename, enum Iconset iconset,
217 loaded_ok = &custom_icons_loaded[SCREEN_REMOTE]; 218 loaded_ok = &custom_icons_loaded[SCREEN_REMOTE];
218 bmp = &user_iconset[SCREEN_REMOTE]; 219 bmp = &user_iconset[SCREEN_REMOTE];
219 bmp->data = icon_buffer[SCREEN_REMOTE]; 220 bmp->data = icon_buffer[SCREEN_REMOTE];
221 bmpformat |= FORMAT_REMOTE;
220 break; 222 break;
221 case Iconset_Remotescreen_viewers: 223 case Iconset_Remotescreen_viewers:
222 loaded_ok = &viewer_icons_loaded[SCREEN_REMOTE]; 224 loaded_ok = &viewer_icons_loaded[SCREEN_REMOTE];
223 bmp = &viewer_iconset[SCREEN_REMOTE]; 225 bmp = &viewer_iconset[SCREEN_REMOTE];
224 bmp->data = viewer_icon_buffer[SCREEN_REMOTE]; 226 bmp->data = viewer_icon_buffer[SCREEN_REMOTE];
227 bmpformat |= FORMAT_REMOTE;
225 break; 228 break;
226#endif 229#endif
227 } 230 }
@@ -232,8 +235,7 @@ static void load_icons(const char* filename, enum Iconset iconset,
232 char path[MAX_PATH]; 235 char path[MAX_PATH];
233 236
234 snprintf(path, sizeof(path), "%s/%s.bmp", ICON_DIR, filename); 237 snprintf(path, sizeof(path), "%s/%s.bmp", ICON_DIR, filename);
235 size_read = read_bmp_file(path, bmp, IMG_BUFSIZE, 238 size_read = read_bmp_file(path, bmp, IMG_BUFSIZE, bmpformat);
236 FORMAT_NATIVE | FORMAT_DITHER);
237 if (size_read > 0) 239 if (size_read > 0)
238 { 240 {
239 *loaded_ok = true; 241 *loaded_ok = true;