CTCaer/RetroArch
1
0
Fork 0
mirror of https://github.com/CTCaer/RetroArch.git synced 2024-12-15 06:50:32 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Implement more types for default select callback

Browse Source
This commit is contained in:
twinaphex 2015-08-16 23:35:09 +02:00
parent c12538c836
commit dadd382dfd
1 changed files with 24 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
menu/cbs/menu_cbs_select.c
View File

@ -35,12 +35,31 @@ static int action_select_default(const char *path, const char *label, unsigned t
cbs = menu_list_get_actiondata_at_offset(menu_list->selection_buf, idx);
if ((cbs && cbs->action_ok) || menu_setting_is_of_general_type(setting))
action = MENU_ACTION_OK;
else { if (cbs && cbs->action_start)
action = MENU_ACTION_START;
if (cbs && cbs->action_right)
RARCH_LOG("setting->type: %d\n", setting->type);
switch (setting->type)
{
case ST_BOOL:
case ST_INT:
case ST_UINT:
case ST_FLOAT:
action = MENU_ACTION_RIGHT;
break;
case ST_PATH:
action = MENU_ACTION_OK;
break;
default:
if ((cbs && cbs->action_ok) || menu_setting_is_of_general_type(setting))
action = MENU_ACTION_OK;
else
{
if (cbs && cbs->action_start)
action = MENU_ACTION_START;
if (cbs && cbs->action_right)
action = MENU_ACTION_RIGHT;
}
break;
}
if (action != MENU_ACTION_NOOP)
@ -57,12 +76,6 @@ static int action_select_path_use_directory(const char *path,
return action_ok_path_use_directory(path, label, type, idx, 0 /* unused */);
}
static int action_select_directory_stub(const char *path, const char *label, unsigned type,
size_t idx)
{
return 0;
}
static int action_select_directory(const char *path, const char *label, unsigned type,
size_t idx)
{
@ -112,9 +125,6 @@ static int menu_cbs_init_bind_select_compare_type(
case MENU_FILE_USE_DIRECTORY:
cbs->action_select = action_select_path_use_directory;
break;
case MENU_FILE_PATH:
cbs->action_select = action_select_directory_stub;
break;
default:
return -1;
}