mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-04-10 15:45:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Pass menu_label to bind OK

Browse Source
This commit is contained in:
twinaphex 2018-02-07 22:19:18 +01:00
parent 2b4b38a5c5
commit f93af36364
3 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
menu/cbs/menu_cbs_ok.c
View File

@ -4525,7 +4525,8 @@ static int menu_cbs_init_bind_ok_compare_type(menu_file_list_cbs_t *cbs,
{ {
BIND_ACTION_OK(cbs, action_ok_deferred_list_stub); BIND_ACTION_OK(cbs, action_ok_deferred_list_stub);
} }
else if (menu_label_hash == MENU_LABEL_CURSOR_MANAGER_LIST) else if (string_is_equal(menu_label,
msg_hash_to_str(MENU_ENUM_LABEL_CURSOR_MANAGER_LIST)))
{ {
BIND_ACTION_OK(cbs, action_ok_cursor_manager_list); BIND_ACTION_OK(cbs, action_ok_cursor_manager_list);
} }
@ -4643,7 +4644,8 @@ static int menu_cbs_init_bind_ok_compare_type(menu_file_list_cbs_t *cbs,
} }
int menu_cbs_init_bind_ok(menu_file_list_cbs_t *cbs, int menu_cbs_init_bind_ok(menu_file_list_cbs_t *cbs,
const char *path, const char *label, unsigned type, size_t idx, const char *path, const char *menu_label,
const char *label, unsigned type, size_t idx,
uint32_t label_hash, uint32_t menu_label_hash) uint32_t label_hash, uint32_t menu_label_hash)
{ {
if (!cbs) if (!cbs)
@ -4654,7 +4656,7 @@ int menu_cbs_init_bind_ok(menu_file_list_cbs_t *cbs,
if (menu_cbs_init_bind_ok_compare_label(cbs, label, label_hash) == 0) if (menu_cbs_init_bind_ok_compare_label(cbs, label, label_hash) == 0)
return 0; return 0;
if (menu_cbs_init_bind_ok_compare_type(cbs, label, label_hash, menu_label_hash, type) == 0) if (menu_cbs_init_bind_ok_compare_type(cbs, menu_label, label_hash, menu_label_hash, type) == 0)
return 0; return 0;
return -1; return -1;

3
menu/menu_cbs.c
View File

@ -237,7 +237,8 @@ void menu_cbs_init(void *data,
/* It will try to find a corresponding callback function inside /* It will try to find a corresponding callback function inside
* menu_cbs_ok.c, then map this callback to the entry. */ * menu_cbs_ok.c, then map this callback to the entry. */
menu_cbs_init_bind_ok(cbs, path, label, type, idx, label_hash, menu_label_hash); menu_cbs_init_bind_ok(cbs, path, menu_label,
label, type, idx, label_hash, menu_label_hash);
menu_cbs_init_log(repr_label, "OK", cbs->action_ok_ident); menu_cbs_init_log(repr_label, "OK", cbs->action_ok_ident);

3
menu/menu_cbs.h
View File

@ -215,7 +215,8 @@ int menu_cbs_init_bind_cancel(menu_file_list_cbs_t *cbs,
const char *path, const char *label, unsigned type, size_t idx); const char *path, const char *label, unsigned type, size_t idx);
int menu_cbs_init_bind_ok(menu_file_list_cbs_t *cbs, int menu_cbs_init_bind_ok(menu_file_list_cbs_t *cbs,
const char *path, const char *label, unsigned type, size_t idx, const char *path, const char *menu_label,
const char *label, unsigned type, size_t idx,
uint32_t label_hash, uint32_t menu_label_hash); uint32_t label_hash, uint32_t menu_label_hash);
int menu_cbs_init_bind_deferred_push(menu_file_list_cbs_t *cbs, int menu_cbs_init_bind_deferred_push(menu_file_list_cbs_t *cbs,