From 15b36a02b156e31ccc3b620604fd53ff53133732 Mon Sep 17 00:00:00 2001 From: Aidan MacDonald Date: Fri, 7 Oct 2022 12:49:24 +0100 Subject: 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 --- apps/gui/viewport.c | 38 -------------------------------------- 1 file changed, 38 deletions(-) (limited to 'apps/gui/viewport.c') 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 */ -} -- cgit v1.2.3