diff --git a/menu/drivers/materialui.c b/menu/drivers/materialui.c index 5ad83937f9..69e9264767 100644 --- a/menu/drivers/materialui.c +++ b/menu/drivers/materialui.c @@ -1002,14 +1002,13 @@ static void mui_frame(void *data) menu_display_unset_viewport(); } -static void mui_font(void) +static void mui_font(enum application_special_type type) { menu_display_ctx_font_t font_info; char fontpath[PATH_MAX_LENGTH] = {0}; int font_size = menu_display_get_font_size(); - fill_pathname_application_special(fontpath, sizeof(fontpath), - APPLICATION_SPECIAL_DIRECTORY_ASSETS_MATERIALUI_FONT); + fill_pathname_application_special(fontpath, sizeof(fontpath), type); font_info.path = fontpath; font_info.size = font_size; @@ -1051,7 +1050,7 @@ static void mui_layout(mui_handle_t *mui) /* we assume the average glyph aspect ratio is close to 3:4 */ mui->glyph_width = new_font_size * 3/4; - mui_font(); + mui_font(APPLICATION_SPECIAL_DIRECTORY_ASSETS_MATERIALUI_FONT); fb_buf = menu_display_get_font_buffer(); diff --git a/menu/drivers/xmb.c b/menu/drivers/xmb.c index b97123821d..c416a77e2a 100644 --- a/menu/drivers/xmb.c +++ b/menu/drivers/xmb.c @@ -2255,8 +2255,7 @@ static void xmb_frame(void *data) menu_display_unset_viewport(); } - -static void xmb_font(xmb_handle_t *xmb) +static void xmb_font(enum application_special_type type) { menu_display_ctx_font_t font_info; char fontpath[PATH_MAX_LENGTH] = {0}; @@ -2264,7 +2263,7 @@ static void xmb_font(xmb_handle_t *xmb) int font_size = menu_display_get_font_size(); fill_pathname_application_special(fontpath, sizeof(fontpath), - APPLICATION_SPECIAL_DIRECTORY_ASSETS_XMB_FONT); + type); font_info.path = fontpath; font_info.size = font_size; @@ -2531,7 +2530,7 @@ static void *xmb_init(void **userdata) menu_display_allocate_white_texture(); xmb_init_horizontal_list(xmb); - xmb_font(xmb); + xmb_font(APPLICATION_SPECIAL_DIRECTORY_ASSETS_XMB_FONT); xmb_init_ribbon(xmb); return menu; @@ -2778,7 +2777,7 @@ static void xmb_context_reset(void *data) APPLICATION_SPECIAL_DIRECTORY_ASSETS_XMB_ICONS); xmb_layout(xmb); - xmb_font(xmb); + xmb_font(APPLICATION_SPECIAL_DIRECTORY_ASSETS_XMB_FONT); xmb_context_reset_textures(xmb, iconpath); xmb_context_reset_background(iconpath); xmb_context_reset_horizontal_list(xmb); diff --git a/menu/drivers/zarch.c b/menu/drivers/zarch.c index 30864b1afd..1a31527681 100644 --- a/menu/drivers/zarch.c +++ b/menu/drivers/zarch.c @@ -169,15 +169,13 @@ struct zui_tabbed static enum zarch_layout_type zarch_layout; -static void zarch_zui_font(void) +static void zarch_zui_font(enum application_special_type type) { menu_display_ctx_font_t font_info; char fontpath[PATH_MAX_LENGTH] = {0}; int font_size = menu_display_get_font_size(); - fill_pathname_application_special( - fontpath, sizeof(fontpath), - APPLICATION_SPECIAL_DIRECTORY_ASSETS_ZARCH_FONT); + fill_pathname_application_special(fontpath, sizeof(fontpath), type); font_info.path = fontpath; font_info.size = font_size; @@ -1029,7 +1027,7 @@ static void *zarch_init(void **userdata) matrix_4x4_ortho(&zui->mvp, 0, 1, 1, 0, 0, 1); - zarch_zui_font(); + zarch_zui_font(APPLICATION_SPECIAL_DIRECTORY_ASSETS_ZARCH_FONT); return menu; error: @@ -1114,7 +1112,7 @@ static void zarch_context_reset(void *data) menu_display_allocate_white_texture(); menu_display_set_font_size(zui->font_size); - zarch_zui_font(); + zarch_zui_font(APPLICATION_SPECIAL_DIRECTORY_ASSETS_ZARCH_FONT); } static int zarch_iterate(void *data, void *userdata, enum menu_action action)