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

Create menu_driver_render_messagebox

Browse Source
This commit is contained in:
twinaphex 2015-03-22 06:37:26 +01:00
parent 81cef83f54
commit d98de68107
4 changed files with 27 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
menu/menu_driver.c
View File

@ -274,6 +274,24 @@ void menu_driver_free(menu_handle_t *menu)
driver->menu_ctx->free(menu);
}
void menu_driver_render_messagebox(const char *msg)
{
driver_t *driver = driver_get_ptr();
if (!driver)
return;
if (!driver->video_data)
return;
if (!driver->menu_ctx)
return;
if (!driver->menu_ctx->render_messagebox)
return;
if (!msg)
return;
if (msg[0] != '\0')
driver->menu_ctx->render_messagebox(msg);
}
void menu_driver_render(void)
{
driver_t *driver = driver_get_ptr();

2
menu/menu_driver.h
View File

@ -312,6 +312,8 @@ void menu_driver_render(void);
void menu_driver_toggle(bool latch);
void menu_driver_render_messagebox(const char *msg);
#ifdef __cplusplus
}
#endif

25
menu/menu_entries_cbs_iterate.c
View File

@ -123,12 +123,7 @@ static int load_or_open_zip_iterate(unsigned action)
" - OK to open as Folder\n"
" - Cancel/Back to Load \n");
if (driver->video_data && driver->menu_ctx
&& driver->menu_ctx->render_messagebox)
{
if (*msg && msg[0] != '\0')
driver->menu_ctx->render_messagebox(msg);
}
menu_driver_render_messagebox(msg);
switch (action)
{
@ -288,8 +283,7 @@ static int action_iterate_help(const char *label, unsigned action)
"Press Accept/OK to continue.",
desc[0], desc[1], desc[2], desc[3], desc[4], desc[5], desc[6], desc[7]);
if (driver->video_data && driver->menu_ctx && driver->menu_ctx->render_messagebox)
driver->menu_ctx->render_messagebox(msg);
menu_driver_render_messagebox(msg);
if (action == MENU_ACTION_OK)
menu_list_pop(menu->menu_list->menu_stack, NULL);
@ -339,12 +333,7 @@ static int action_iterate_info(const char *label, unsigned action)
setting_get_description(needle, msg, sizeof(msg));
if (driver->video_data && driver->menu_ctx &&
driver->menu_ctx->render_messagebox)
{
if (*msg && msg[0] != '\0')
driver->menu_ctx->render_messagebox(msg);
}
menu_driver_render_messagebox(msg);
if (action == MENU_ACTION_OK)
menu_list_pop(menu->menu_list->menu_stack, &menu->navigation.selection_ptr);
@ -536,9 +525,7 @@ static int action_iterate_menu_viewport(const char *label, unsigned action)
base_msg, custom->x, custom->y, custom->width, custom->height);
}
if (driver->video_data && driver->menu_ctx &&
driver->menu_ctx->render_messagebox)
driver->menu_ctx->render_messagebox(msg);
menu_driver_render_messagebox(msg);
if (!custom->width)
custom->width = stride_x;
@ -581,9 +568,7 @@ static int action_iterate_message(const char *label, unsigned action)
if (!menu)
return -1;
if (driver->video_data && driver->menu_ctx
&& driver->menu_ctx->render_messagebox)
driver->menu_ctx->render_messagebox(menu->message_contents);
menu_driver_render_messagebox(menu->message_contents);
if (action == MENU_ACTION_OK)
menu_list_pop_stack(menu->menu_list);

8
menu/menu_input.c
View File

@ -395,9 +395,7 @@ int menu_input_bind_iterate(void)
input_config_bind_map[
menu->binds.begin - MENU_SETTINGS_BIND_BEGIN].desc);
if (driver->video_data && driver->menu_ctx
&& driver->menu_ctx->render_messagebox)
driver->menu_ctx->render_messagebox( msg);
menu_driver_render_messagebox(msg);
driver->block_input = true;
menu_input_poll_bind_state(&binds);
@ -443,9 +441,7 @@ int menu_input_bind_iterate_keyboard(void)
menu->binds.begin - MENU_SETTINGS_BIND_BEGIN].desc,
timeout);
if (driver->video_data && driver->menu_ctx
&& driver->menu_ctx->render_messagebox)
driver->menu_ctx->render_messagebox(msg);
menu_driver_render_messagebox(msg);
if (timeout <= 0)
{