diff --git a/file_path_special.c b/file_path_special.c index 98a831b6e8..9b3543f587 100644 --- a/file_path_special.c +++ b/file_path_special.c @@ -325,6 +325,16 @@ void fill_pathname_application_special(char *s, size_t len, enum application_spe fill_pathname_slash(s1, sizeof(s1)); strlcpy(s, s1, len); } +#endif + break; + case APPLICATION_SPECIAL_DIRECTORY_ASSETS_MATERIALUI_FONT: +#ifdef HAVE_MATERIALUI + { + char s1[PATH_MAX_LENGTH] = {0}; + fill_pathname_application_special(s1, sizeof(s1), + APPLICATION_SPECIAL_DIRECTORY_ASSETS_MATERIALUI); + fill_pathname_join(s, s1, "Roboto-Regular.ttf", len); + } #endif break; case APPLICATION_SPECIAL_NONE: diff --git a/file_path_special.h b/file_path_special.h index daac5a591a..cf8d620861 100644 --- a/file_path_special.h +++ b/file_path_special.h @@ -26,9 +26,11 @@ enum application_special_type { APPLICATION_SPECIAL_NONE = 0, APPLICATION_SPECIAL_DIRECTORY_ASSETS_MATERIALUI, + APPLICATION_SPECIAL_DIRECTORY_ASSETS_MATERIALUI_FONT, APPLICATION_SPECIAL_DIRECTORY_ASSETS_MATERIALUI_ICONS, APPLICATION_SPECIAL_DIRECTORY_ASSETS_XMB, - APPLICATION_SPECIAL_DIRECTORY_ASSETS_XMB_ICONS + APPLICATION_SPECIAL_DIRECTORY_ASSETS_XMB_ICONS, + APPLICATION_SPECIAL_DIRECTORY_ASSETS_XMB_FONT }; bool fill_pathname_application_data(char *s, size_t len); diff --git a/menu/drivers/materialui.c b/menu/drivers/materialui.c index 4bac873765..b8786dd877 100644 --- a/menu/drivers/materialui.c +++ b/menu/drivers/materialui.c @@ -1005,15 +1005,12 @@ static void mui_frame(void *data) static void mui_font(void) { menu_display_ctx_font_t font_info; - char mediapath[PATH_MAX_LENGTH] = {0}; char fontpath[PATH_MAX_LENGTH] = {0}; settings_t *settings = config_get_ptr(); int font_size = menu_display_get_font_size(); - fill_pathname_application_special(mediapath, sizeof(mediapath), - APPLICATION_SPECIAL_DIRECTORY_ASSETS_MATERIALUI); - fill_pathname_join(fontpath, mediapath, - "Roboto-Regular.ttf", sizeof(fontpath)); + fill_pathname_application_special(fontpath, sizeof(fontpath), + APPLICATION_SPECIAL_DIRECTORY_ASSETS_MATERIALUI_FONT); font_info.path = fontpath; font_info.size = font_size;