mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-02-25 12:41:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update

Browse Source
This commit is contained in:
twinaphex 2017-09-28 08:55:40 +02:00
parent 9185fb3ed1
commit 65edb2f06c
3 changed files with 12 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
menu/drivers/menu_generic.c
View File

@ -80,7 +80,7 @@ int generic_menu_iterate(void *data, void *userdata, enum menu_action action)
if (!menu)
return 0;
menu->menu_state.msg[0] = '\0';
menu->menu_state_msg[0] = '\0';
if (!string_is_empty(label))
hash = msg_hash_calculate(label);
@ -99,7 +99,7 @@ int generic_menu_iterate(void *data, void *userdata, enum menu_action action)
{
case ITERATE_TYPE_HELP:
ret = menu_dialog_iterate(
menu->menu_state.msg, sizeof(menu->menu_state.msg), label);
menu->menu_state_msg, sizeof(menu->menu_state_msg), label);
BIT64_SET(menu->state, MENU_STATE_RENDER_MESSAGEBOX);
BIT64_SET(menu->state, MENU_STATE_POST_ITERATE);
if (ret == 1 || action == MENU_ACTION_OK)
@ -118,8 +118,8 @@ int generic_menu_iterate(void *data, void *userdata, enum menu_action action)
{
menu_input_ctx_bind_t bind;
bind.s = menu->menu_state.msg;
bind.len = sizeof(menu->menu_state.msg);
bind.s = menu->menu_state_msg;
bind.len = sizeof(menu->menu_state_msg);
if (menu_input_key_bind_iterate(&bind))
{
@ -139,7 +139,7 @@ int generic_menu_iterate(void *data, void *userdata, enum menu_action action)
if (cbs->enum_idx != MSG_UNKNOWN)
{
ret = menu_hash_get_help_enum(cbs->enum_idx,
menu->menu_state.msg, sizeof(menu->menu_state.msg));
menu->menu_state_msg, sizeof(menu->menu_state_msg));
}
else
{
@ -205,7 +205,7 @@ int generic_menu_iterate(void *data, void *userdata, enum menu_action action)
if (enum_idx != MSG_UNKNOWN)
ret = menu_hash_get_help_enum(enum_idx,
menu->menu_state.msg, sizeof(menu->menu_state.msg));
menu->menu_state_msg, sizeof(menu->menu_state_msg));
}
}

6
menu/menu_driver.c
View File

@ -1581,17 +1581,17 @@ bool menu_driver_render(bool is_idle, bool rarch_is_inited,
menu_display_framebuf_dirty = true;
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))
{
if (menu_driver_ctx->render_messagebox)
menu_driver_ctx->render_messagebox(menu_userdata,
menu_driver_data->menu_state.msg);
menu_driver_data->menu_state_msg);
if (ui_companion_is_on_foreground())
{
const ui_companion_driver_t *ui = ui_companion_get_ptr();
if (ui->render_messagebox)
ui->render_messagebox(menu_driver_data->menu_state.msg);
ui->render_messagebox(menu_driver_data->menu_state_msg);
}
}

10
menu/menu_driver.h
View File

@ -338,6 +338,9 @@ typedef struct menu_display_ctx_driver
typedef struct
{
uint64_t state;
char menu_state_msg[1024];
/* Scratchpad variables. These are used for instance
* by the filebrowser when having to store intermediary
* paths (subdirs/previous dirs/current dir/path, etc).
@ -348,13 +351,6 @@ typedef struct
/* path to the currently loaded database playlist file. */
char db_playlist_file[PATH_MAX_LENGTH];
uint64_t state;
struct
{
char msg[1024];
} menu_state;
} menu_handle_t;
typedef struct menu_display_ctx_draw