diff options
Diffstat (limited to 'apps/gui')
-rw-r--r-- | apps/gui/skin_engine/skin_parser.c | 31 | ||||
-rw-r--r-- | apps/gui/viewport.c | 38 | ||||
-rw-r--r-- | apps/gui/viewport.h | 1 |
3 files changed, 29 insertions, 41 deletions
diff --git a/apps/gui/skin_engine/skin_parser.c b/apps/gui/skin_engine/skin_parser.c index 4e3b7e4d12..6fb1b2a43c 100644 --- a/apps/gui/skin_engine/skin_parser.c +++ b/apps/gui/skin_engine/skin_parser.c | |||
@@ -712,8 +712,35 @@ static int parse_viewportcolour(struct skin_element *element, | |||
712 | return -1; | 712 | return -1; |
713 | if (isdefault(param)) | 713 | if (isdefault(param)) |
714 | { | 714 | { |
715 | colour->colour = get_viewport_default_colour(curr_screen, | 715 | unsigned int fg_color; |
716 | token->type == SKIN_TOKEN_VIEWPORT_FGCOLOUR); | 716 | unsigned int bg_color; |
717 | |||
718 | switch (curr_screen) | ||
719 | { | ||
720 | #if defined(HAVE_REMOTE_LCD) && LCD_REMOTE_DEPTH > 1 | ||
721 | case SCREEN_REMOTE: | ||
722 | fg_color = LCD_REMOTE_DEFAULT_FG; | ||
723 | bg_color = LCD_REMOTE_DEFAULT_BG; | ||
724 | break; | ||
725 | #endif | ||
726 | default: | ||
727 | #if defined(HAVE_LCD_COLOR) | ||
728 | fg_color = global_settings.fg_color; | ||
729 | bg_color = global_settings.bg_color; | ||
730 | #elif LCD_DEPTH > 1 | ||
731 | fg_color = LCD_DEFAULT_FG; | ||
732 | bg_color = LCD_DEFAULT_BG; | ||
733 | #else | ||
734 | fg_color = 0; | ||
735 | bg_color = 0; | ||
736 | #endif | ||
737 | break; | ||
738 | } | ||
739 | |||
740 | if (token->type == SKIN_TOKEN_VIEWPORT_FGCOLOUR) | ||
741 | colour->colour = fg_color; | ||
742 | else | ||
743 | colour->colour = bg_color; | ||
717 | } | 744 | } |
718 | else | 745 | else |
719 | { | 746 | { |
diff --git a/apps/gui/viewport.c b/apps/gui/viewport.c index 9f9cb186f5..e8ec83c640 100644 --- a/apps/gui/viewport.c +++ b/apps/gui/viewport.c | |||
@@ -348,41 +348,3 @@ void viewport_set_defaults(struct viewport *vp, | |||
348 | #endif /* !__PCTOOL__ */ | 348 | #endif /* !__PCTOOL__ */ |
349 | viewport_set_fullscreen(vp, screen); | 349 | viewport_set_fullscreen(vp, screen); |
350 | } | 350 | } |
351 | |||
352 | |||
353 | int get_viewport_default_colour(enum screen_type screen, bool fgcolour) | ||
354 | { | ||
355 | (void)screen; (void)fgcolour; | ||
356 | #if (LCD_DEPTH > 1) || (defined(HAVE_REMOTE_LCD) && LCD_REMOTE_DEPTH > 1) | ||
357 | int colour; | ||
358 | if (fgcolour) | ||
359 | { | ||
360 | #if (defined(HAVE_REMOTE_LCD) && LCD_REMOTE_DEPTH > 1) | ||
361 | if (screen == SCREEN_REMOTE) | ||
362 | colour = REMOTE_FG_FALLBACK; | ||
363 | else | ||
364 | #endif | ||
365 | #if defined(HAVE_LCD_COLOR) | ||
366 | colour = global_settings.fg_color; | ||
367 | #else | ||
368 | colour = FG_FALLBACK; | ||
369 | #endif | ||
370 | } | ||
371 | else | ||
372 | { | ||
373 | #if (defined(HAVE_REMOTE_LCD) && LCD_REMOTE_DEPTH > 1) | ||
374 | if (screen == SCREEN_REMOTE) | ||
375 | colour = REMOTE_BG_FALLBACK; | ||
376 | else | ||
377 | #endif | ||
378 | #if defined(HAVE_LCD_COLOR) | ||
379 | colour = global_settings.bg_color; | ||
380 | #else | ||
381 | colour = BG_FALLBACK; | ||
382 | #endif | ||
383 | } | ||
384 | return colour; | ||
385 | #else | ||
386 | return 0; | ||
387 | #endif /* LCD_DEPTH > 1 || LCD_REMOTE_DEPTH > 1 */ | ||
388 | } | ||
diff --git a/apps/gui/viewport.h b/apps/gui/viewport.h index 2810be2ac3..c57a58b232 100644 --- a/apps/gui/viewport.h +++ b/apps/gui/viewport.h | |||
@@ -43,7 +43,6 @@ void viewport_set_defaults(struct viewport *vp, | |||
43 | const enum screen_type screen); | 43 | const enum screen_type screen); |
44 | void viewport_set_fullscreen(struct viewport *vp, | 44 | void viewport_set_fullscreen(struct viewport *vp, |
45 | const enum screen_type screen); | 45 | const enum screen_type screen); |
46 | int get_viewport_default_colour(enum screen_type screen, bool fgcolour); | ||
47 | 46 | ||
48 | #ifndef __PCTOOL__ | 47 | #ifndef __PCTOOL__ |
49 | 48 | ||