libretro/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch.git synced 2024-11-28 02:30:35 +00:00
Code Issues Actions 44 Packages Projects Releases Wiki Activity

Pass param

Browse Source
This commit is contained in:
twinaphex 2017-04-29 17:19:29 +02:00
parent b515cd10f1
commit 5f6a342817
5 changed files with 25 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
menu/drivers/materialui.c
View File

@ -1440,11 +1440,15 @@ static void mui_layout(mui_handle_t *mui, bool video_is_threaded)
mui->glyph_width = new_font_size * 3/4;
mui->glyph_width2 = new_font_size2 * 3/4;
mui->font = menu_display_font(APPLICATION_SPECIAL_DIRECTORY_ASSETS_MATERIALUI_FONT,
new_font_size);
mui->font = menu_display_font(
APPLICATION_SPECIAL_DIRECTORY_ASSETS_MATERIALUI_FONT,
new_font_size,
video_is_threaded);
mui->font2 = menu_display_font(APPLICATION_SPECIAL_DIRECTORY_ASSETS_MATERIALUI_FONT,
new_font_size2);
mui->font2 = menu_display_font(
APPLICATION_SPECIAL_DIRECTORY_ASSETS_MATERIALUI_FONT,
new_font_size2,
video_is_threaded);
if (mui->font) /* calculate a more realistic ticker_limit */
{

8
menu/drivers/xmb.c
View File

@ -3550,8 +3550,12 @@ static void xmb_context_reset(void *data, bool is_threaded)
APPLICATION_SPECIAL_DIRECTORY_ASSETS_XMB_ICONS);
xmb_layout(xmb);
xmb->font = menu_display_font(APPLICATION_SPECIAL_DIRECTORY_ASSETS_XMB_FONT, xmb->font_size);
xmb->font2 = menu_display_font(APPLICATION_SPECIAL_DIRECTORY_ASSETS_XMB_FONT, xmb->font2_size);
xmb->font = menu_display_font(APPLICATION_SPECIAL_DIRECTORY_ASSETS_XMB_FONT,
xmb->font_size,
is_threaded);
xmb->font2 = menu_display_font(APPLICATION_SPECIAL_DIRECTORY_ASSETS_XMB_FONT,
xmb->font2_size,
is_threaded);
xmb_context_reset_textures(xmb, iconpath);
xmb_context_reset_background(iconpath);
xmb_context_reset_horizontal_list(xmb);

4
menu/drivers/zarch.c
View File

@ -1097,7 +1097,9 @@ static void zarch_context_reset(void *data, bool is_threaded)
menu_display_allocate_white_texture();
menu_display_set_header_height(zui->header_height);
zui->font = menu_display_font(APPLICATION_SPECIAL_DIRECTORY_ASSETS_ZARCH_FONT, zui->font_size);
zui->font = menu_display_font(APPLICATION_SPECIAL_DIRECTORY_ASSETS_ZARCH_FONT,
zui->font_size,
is_threaded);
}
static int zarch_iterate(void *data, void *userdata, enum menu_action action)

11
menu/menu_display.c
View File

@ -212,23 +212,24 @@ void menu_display_font_free(font_data_t *font)
font_driver_free(font);
}
static font_data_t *menu_display_font_main_init(menu_display_ctx_font_t *font)
static font_data_t *menu_display_font_main_init(menu_display_ctx_font_t *font,
bool is_threaded)
{
font_data_t *font_data = NULL;
bool *is_threaded = video_driver_get_threaded();
if (!font || !menu_disp)
return NULL;
if (!menu_disp->font_init_first((void**)&font_data,
video_driver_get_ptr(false),
font->path, font->size, *is_threaded))
font->path, font->size, is_threaded))
return NULL;
return font_data;
}
font_data_t *menu_display_font(enum application_special_type type, float font_size)
font_data_t *menu_display_font(enum application_special_type type, float font_size,
bool is_threaded)
{
menu_display_ctx_font_t font_info;
char fontpath[PATH_MAX_LENGTH];
@ -240,7 +241,7 @@ font_data_t *menu_display_font(enum application_special_type type, float font_si
font_info.path = fontpath;
font_info.size = font_size;
return menu_display_font_main_init(&font_info);
return menu_display_font_main_init(&font_info, is_threaded);
}
void menu_display_font_bind_block(font_data_t *font, void *block)

3
menu/menu_display.h
View File

@ -295,7 +295,8 @@ void menu_display_draw_text(
void menu_display_set_alpha(float *color, float alpha_value);
font_data_t *menu_display_font(enum application_special_type type, float font_size);
font_data_t *menu_display_font(enum application_special_type type, float font_size,
bool video_is_threaded);
void menu_display_reset_textures_list(const char *texture_path, const char *iconpath,
uintptr_t *item, enum texture_filter_type filter_type);