mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-04-04 04:20:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

More cleanups

Browse Source
This commit is contained in:
twinaphex 2016-06-11 20:01:33 +02:00
parent f3815ed815
commit 7d0cb7c689
2 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
file_path_special.c
View File

@ -335,6 +335,18 @@ void fill_pathname_application_special(char *s, size_t len, enum application_spe
APPLICATION_SPECIAL_DIRECTORY_ASSETS_MATERIALUI); APPLICATION_SPECIAL_DIRECTORY_ASSETS_MATERIALUI);
fill_pathname_join(s, s1, "Roboto-Regular.ttf", len); fill_pathname_join(s, s1, "Roboto-Regular.ttf", len);
} }
#endif
break;
case APPLICATION_SPECIAL_DIRECTORY_ASSETS_XMB_FONT:
#ifdef HAVE_XMB
{
char s1[PATH_MAX_LENGTH] = {0};
settings_t *settings = config_get_ptr();
fill_pathname_application_special(s1, sizeof(s1),
APPLICATION_SPECIAL_DIRECTORY_ASSETS_XMB);
fill_pathname_join(s, s1, "font.ttf", len);
}
#endif #endif
break; break;
case APPLICATION_SPECIAL_NONE: case APPLICATION_SPECIAL_NONE:

9
menu/drivers/xmb.c
View File

@ -2275,17 +2275,14 @@ static void xmb_frame(void *data)
static void xmb_font(xmb_handle_t *xmb) static void xmb_font(xmb_handle_t *xmb)
{ {
menu_display_ctx_font_t font_info; menu_display_ctx_font_t font_info;
char themepath[PATH_MAX_LENGTH] = {0};
char fontpath[PATH_MAX_LENGTH] = {0}; char fontpath[PATH_MAX_LENGTH] = {0};
settings_t *settings = config_get_ptr(); settings_t *settings = config_get_ptr();
int font_size = menu_display_get_font_size(); int font_size = menu_display_get_font_size();
fill_pathname_application_special(themepath, sizeof(themepath), fill_pathname_application_special(fontpath, sizeof(fontpath),
APPLICATION_SPECIAL_DIRECTORY_ASSETS_XMB); APPLICATION_SPECIAL_DIRECTORY_ASSETS_XMB_FONT);
if (string_is_empty(settings->menu.xmb_font)) if (!string_is_empty(settings->menu.xmb_font))
fill_pathname_join(fontpath, themepath, "font.ttf", sizeof(fontpath));
else
strlcpy(fontpath, settings->menu.xmb_font,sizeof(fontpath)); strlcpy(fontpath, settings->menu.xmb_font,sizeof(fontpath));
font_info.path = fontpath; font_info.path = fontpath;