ShuriZma
/
RetroArch
mirror of https://github.com/libretro/RetroArch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Get rid of more MENU_CTL actions

This commit is contained in:
twinaphex 2017-01-22 17:22:05 +01:00
parent 985c6a4ed2
commit e33f38d5b2
2 changed files with 6 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
menu/menu_driver.c
View File

@ -345,7 +345,9 @@ bool menu_driver_render(bool is_idle)
if (BIT64_GET(menu_driver_data->state, MENU_STATE_RENDER_MESSAGEBOX) if (BIT64_GET(menu_driver_data->state, MENU_STATE_RENDER_MESSAGEBOX)
&& !string_is_empty(menu_driver_data->menu_state.msg)) && !string_is_empty(menu_driver_data->menu_state.msg))
{ {
menu_driver_ctl(RARCH_MENU_CTL_RENDER_MESSAGEBOX, NULL); if (menu_driver_ctx->render_messagebox)
menu_driver_ctx->render_messagebox(menu_userdata,
menu_driver_data->menu_state.msg);
if (ui_companion_is_on_foreground()) if (ui_companion_is_on_foreground())
{ {
@ -359,7 +361,9 @@ bool menu_driver_render(bool is_idle)
{ {
settings_t *settings = config_get_ptr(); settings_t *settings = config_get_ptr();
menu_animation_update_time(settings->menu.timedate_enable); menu_animation_update_time(settings->menu.timedate_enable);
menu_driver_ctl(RARCH_MENU_CTL_BLIT_RENDER, NULL);
if (menu_driver_ctx->render)
menu_driver_ctx->render(menu_userdata);
} }
if (menu_driver_alive && !is_idle) if (menu_driver_alive && !is_idle)
@ -487,15 +491,6 @@ bool menu_driver_ctl(enum rarch_menu_ctl_state state, void *data)
memset(&menu_driver_system, 0, sizeof(struct retro_system_info)); memset(&menu_driver_system, 0, sizeof(struct retro_system_info));
} }
break; break;
case RARCH_MENU_CTL_RENDER_MESSAGEBOX:
if (menu_driver_ctx->render_messagebox)
menu_driver_ctx->render_messagebox(menu_userdata,
menu_driver_data->menu_state.msg);
break;
case RARCH_MENU_CTL_BLIT_RENDER:
if (menu_driver_ctx->render)
menu_driver_ctx->render(menu_userdata);
break;
case RARCH_MENU_CTL_SET_PREVENT_POPULATE: case RARCH_MENU_CTL_SET_PREVENT_POPULATE:
menu_driver_prevent_populate = true; menu_driver_prevent_populate = true;
break; break;

2
menu/menu_driver.h
View File

@ -96,8 +96,6 @@ enum rarch_menu_ctl_state
RARCH_MENU_CTL_SET_PENDING_SHUTDOWN, RARCH_MENU_CTL_SET_PENDING_SHUTDOWN,
RARCH_MENU_CTL_DEINIT, RARCH_MENU_CTL_DEINIT,
RARCH_MENU_CTL_INIT, RARCH_MENU_CTL_INIT,
RARCH_MENU_CTL_BLIT_RENDER,
RARCH_MENU_CTL_RENDER_MESSAGEBOX,
RARCH_MENU_CTL_SET_PREVENT_POPULATE, RARCH_MENU_CTL_SET_PREVENT_POPULATE,
RARCH_MENU_CTL_UNSET_PREVENT_POPULATE, RARCH_MENU_CTL_UNSET_PREVENT_POPULATE,
RARCH_MENU_CTL_IS_PREVENT_POPULATE, RARCH_MENU_CTL_IS_PREVENT_POPULATE,