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 | |
| parent | 016090b2a41b6972876f16376be4393eb3600d11 (diff) | |
| download | rockbox-15b36a02b1.tar.gz rockbox-15b36a02b1.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
| -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, return -1; if (isdefault(param)) { - colour->colour = get_viewport_default_colour(curr_screen, - token->type == SKIN_TOKEN_VIEWPORT_FGCOLOUR); + unsigned int fg_color; + unsigned int bg_color; + + switch (curr_screen) + { +#if defined(HAVE_REMOTE_LCD) && LCD_REMOTE_DEPTH > 1 + case SCREEN_REMOTE: + fg_color = LCD_REMOTE_DEFAULT_FG; + bg_color = LCD_REMOTE_DEFAULT_BG; + break; +#endif + default: +#if defined(HAVE_LCD_COLOR) + fg_color = global_settings.fg_color; + bg_color = global_settings.bg_color; +#elif LCD_DEPTH > 1 + fg_color = LCD_DEFAULT_FG; + bg_color = LCD_DEFAULT_BG; +#else + fg_color = 0; + bg_color = 0; +#endif + break; + } + + if (token->type == SKIN_TOKEN_VIEWPORT_FGCOLOUR) + colour->colour = fg_color; + else + colour->colour = bg_color; } else { 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, #endif /* !__PCTOOL__ */ viewport_set_fullscreen(vp, screen); } - - -int get_viewport_default_colour(enum screen_type screen, bool fgcolour) -{ - (void)screen; (void)fgcolour; -#if (LCD_DEPTH > 1) || (defined(HAVE_REMOTE_LCD) && LCD_REMOTE_DEPTH > 1) - int colour; - if (fgcolour) - { -#if (defined(HAVE_REMOTE_LCD) && LCD_REMOTE_DEPTH > 1) - if (screen == SCREEN_REMOTE) - colour = REMOTE_FG_FALLBACK; - else -#endif -#if defined(HAVE_LCD_COLOR) - colour = global_settings.fg_color; -#else - colour = FG_FALLBACK; -#endif - } - else - { -#if (defined(HAVE_REMOTE_LCD) && LCD_REMOTE_DEPTH > 1) - if (screen == SCREEN_REMOTE) - colour = REMOTE_BG_FALLBACK; - else -#endif -#if defined(HAVE_LCD_COLOR) - colour = global_settings.bg_color; -#else - colour = BG_FALLBACK; -#endif - } - return colour; -#else - return 0; -#endif /* LCD_DEPTH > 1 || LCD_REMOTE_DEPTH > 1 */ -} 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, const enum screen_type screen); void viewport_set_fullscreen(struct viewport *vp, const enum screen_type screen); -int get_viewport_default_colour(enum screen_type screen, bool fgcolour); #ifndef __PCTOOL__ |