forked from len0rd/rockbox
Change screens memebers char_width, char_height and nb_lines to functions returning a calculated value. Fixes FS #9361 because the values were calculated based on sysfont, not the user selected font.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@18441 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
parent
e682143af5
commit
3c1e9ca558
9 changed files with 124 additions and 86 deletions
10
apps/main.c
10
apps/main.c
|
@ -288,7 +288,6 @@ static void init(void)
|
|||
debug_init();
|
||||
#endif
|
||||
/* Must be done before any code uses the multi-screen APi */
|
||||
screen_access_init();
|
||||
gui_syncstatusbar_init(&statusbars);
|
||||
ata_init();
|
||||
settings_reset();
|
||||
|
@ -404,13 +403,12 @@ static void init(void)
|
|||
button_init();
|
||||
|
||||
powermgmt_init();
|
||||
|
||||
|
||||
#if CONFIG_TUNER
|
||||
radio_init();
|
||||
#endif
|
||||
|
||||
/* Must be done before any code uses the multi-screen APi */
|
||||
screen_access_init();
|
||||
gui_syncstatusbar_init(&statusbars);
|
||||
|
||||
#if CONFIG_CHARGING && (CONFIG_CPU == SH7034)
|
||||
|
@ -448,11 +446,11 @@ static void init(void)
|
|||
#ifdef HAVE_EEPROM_SETTINGS
|
||||
eeprom_settings_init();
|
||||
#endif
|
||||
|
||||
|
||||
usb_start_monitoring();
|
||||
#ifndef HAVE_USBSTACK
|
||||
while (usb_detect() == USB_INSERTED)
|
||||
{
|
||||
{
|
||||
#ifdef HAVE_EEPROM_SETTINGS
|
||||
firmware_settings.disk_clean = false;
|
||||
#endif
|
||||
|
@ -517,7 +515,7 @@ static void init(void)
|
|||
remove(TAGCACHE_STATEFILE);
|
||||
#endif
|
||||
}
|
||||
|
||||
|
||||
gui_sync_wps_init();
|
||||
settings_apply(true);
|
||||
init_dircache(false);
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue