From a969e1f4561397e67cc0f3e5869f67aea213c13b Mon Sep 17 00:00:00 2001
From: Thomas Martitz <kugel@rockbox.org>
Date: Wed, 15 Jan 2014 13:37:58 +0100
Subject: usb: Do not disable themes in the USB screen.

Fonts can now be assumed (by the code) to be available during USB. Make
use of this fact in the USB screen and don't disable the skins.

Change-Id: I525359aae16660604e8fe89addc0bdf97a3fafc1
---
 apps/gui/usb_screen.c | 35 ++++++++++++++---------------------
 1 file changed, 14 insertions(+), 21 deletions(-)

(limited to 'apps/gui/usb_screen.c')

diff --git a/apps/gui/usb_screen.c b/apps/gui/usb_screen.c
index ff437ca10a..200abafcc4 100644
--- a/apps/gui/usb_screen.c
+++ b/apps/gui/usb_screen.c
@@ -134,7 +134,6 @@ struct usb_screen_vps_t
 static void usb_screen_fix_viewports(struct screen *screen,
         struct usb_screen_vps_t *usb_screen_vps)
 {
-    bool disable = true;
     int logo_width, logo_height;
     struct viewport *parent = &usb_screen_vps->parent;
     struct viewport *logo = &usb_screen_vps->logo;
@@ -154,11 +153,7 @@ static void usb_screen_fix_viewports(struct screen *screen,
         logo_height = BMPHEIGHT_usblogo;
     }
 
-    viewport_set_defaults(parent, screen->screen_type);
-    disable = (parent->width < logo_width || parent->height < logo_height);
-    viewportmanager_theme_enable(screen->screen_type, !disable, parent);
-    screen->clear_display();
-    screen->scroll_stop();
+    viewportmanager_theme_enable(screen->screen_type, true, parent);
 
     *logo = *parent;
     logo->x = parent->x + parent->width - logo_width;
@@ -259,19 +254,6 @@ void gui_usb_screen_run(bool early_usb)
     usb_keypad_mode = global_settings.usb_keypad_mode;
 #endif
 
-    if(!early_usb)
-    {
-        /* The font system leaves the .fnt fd's open, so we need for force close them all */
-#ifdef HAVE_LCD_BITMAP
-        FOR_NB_SCREENS(i)
-        {
-            font_unload(screens[i].getuifont());
-            screens[i].setuifont(FONT_SYSFIXED);
-        }
-        skin_unload_all();
-#endif
-    }
-
     FOR_NB_SCREENS(i)
     {
         struct screen *screen = &screens[i];
@@ -285,6 +267,17 @@ void gui_usb_screen_run(bool early_usb)
 #endif
     }
 
+    /* update the UI before disabling fonts, this maximizes the propability
+     * that font cache lookups succeed during USB */
+    send_event(GUI_EVENT_ACTIONUPDATE, NULL);
+#ifdef HAVE_LCD_BITMAP
+    if(!early_usb)
+    {
+        /* The font system leaves the .fnt fd's open, so we need for force close them all */
+        font_disable_all();
+    }
+#endif
+
     usb_acknowledge(SYS_USB_CONNECTED_ACK);
 
     while (1)
@@ -327,12 +320,13 @@ void gui_usb_screen_run(bool early_usb)
 #ifdef HAVE_LCD_CHARCELLS
     status_set_usb(false);
 #endif /* HAVE_LCD_CHARCELLS */
+
 #ifdef HAVE_LCD_BITMAP
     if(!early_usb)
     {
+        font_enable_all();
         /* Not pretty, reload all settings so fonts are loaded again correctly */
         settings_apply(true);
-        settings_apply_skins();
         /* Reload playlist */
         playlist_resume();
     }
@@ -345,4 +339,3 @@ void gui_usb_screen_run(bool early_usb)
     }
 
 }
-
-- 
cgit v1.2.3