diff options
author | Aidan MacDonald <amachronic@protonmail.com> | 2022-10-07 12:49:24 +0100 |
---|---|---|
committer | Aidan MacDonald <amachronic@protonmail.com> | 2022-11-17 16:12:19 +0000 |
commit | 15b36a02b156e31ccc3b620604fd53ff53133732 (patch) | |
tree | c82406eac57b92d7204241ac7b49d358e369981a /apps/gui/skin_engine | |
parent | 016090b2a41b6972876f16376be4393eb3600d11 (diff) | |
download | rockbox-15b36a02b156e31ccc3b620604fd53ff53133732.tar.gz rockbox-15b36a02b156e31ccc3b620604fd53ff53133732.zip |
Remove get_viewport_default_colour()
The function isn't used except for the skin engine's %Vf/%Vb tags,
so inline it there and remove the separate function.
Change-Id: Ia207321877234bc3679457c820a4292ae53f3520
Diffstat (limited to 'apps/gui/skin_engine')
-rw-r--r-- | apps/gui/skin_engine/skin_parser.c | 31 |
1 files changed, 29 insertions, 2 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 | { |