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

Move more code over to menu_entries_cbs.c

Browse Source
This commit is contained in:
twinaphex 2014-10-12 05:36:54 +02:00
parent 7a1851f80c
commit d824279198
2 changed files with 30 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
frontend/menu/backend/menu_common_backend.c
View File

@ -185,14 +185,6 @@ static int menu_setting_ok_toggle(unsigned type,
if (cbs && cbs->action_ok) if (cbs && cbs->action_ok)
return cbs->action_ok(dir, label, type, driver.menu->selection_ptr); return cbs->action_ok(dir, label, type, driver.menu->selection_ptr);
if (menu_common_type_is(label, type) == MENU_SETTINGS)
{
menu_entries_push(driver.menu->menu_stack,
dir ? dir : label, label, type,
driver.menu->selection_ptr);
return 0;
}
return -1; return -1;
} }

30
frontend/menu/menu_entries_cbs.c
View File

@ -563,6 +563,18 @@ static int action_ok_configurations_list(const char *path,
return 0; return 0;
} }
static int action_ok_push_default(const char *path,
const char *label, unsigned type, size_t index)
{
if (!driver.menu)
return -1;
menu_entries_push(driver.menu->menu_stack,
label, label, type,
driver.menu->selection_ptr);
return 0;
}
/* Bind the OK callback function */ /* Bind the OK callback function */
static int menu_entries_cbs_init_bind_ok(menu_file_list_cbs_t *cbs, static int menu_entries_cbs_init_bind_ok(menu_file_list_cbs_t *cbs,
@ -639,6 +651,10 @@ static int menu_entries_cbs_init_bind_ok(menu_file_list_cbs_t *cbs,
case MENU_SETTINGS_CUSTOM_VIEWPORT: case MENU_SETTINGS_CUSTOM_VIEWPORT:
cbs->action_ok = action_ok_custom_viewport; cbs->action_ok = action_ok_custom_viewport;
break; break;
case MENU_SETTINGS:
case MENU_FILE_CATEGORY:
cbs->action_ok = action_ok_push_default;
break;
default: default:
return -1; return -1;
} }
@ -656,6 +672,20 @@ static void menu_entries_cbs_init_bind_ok_toggle(menu_file_list_cbs_t *cbs,
if (menu_entries_cbs_init_bind_ok(cbs, path, label, type, index) == 0) if (menu_entries_cbs_init_bind_ok(cbs, path, label, type, index) == 0)
return; return;
else if (
!strcmp(label, "Shader Options") ||
!strcmp(label, "Input Options") ||
!strcmp(label, "core_options") ||
!strcmp(label, "core_information") ||
!strcmp(label, "video_shader_parameters") ||
!strcmp(label, "video_shader_preset_parameters") ||
!strcmp(label, "disk_options") ||
!strcmp(label, "settings") ||
!strcmp(label, "performance_counters") ||
!strcmp(label, "frontend_counters") ||
!strcmp(label, "core_counters")
)
cbs->action_ok = action_ok_push_default;
else if ( else if (
!strcmp(label, "load_content") || !strcmp(label, "load_content") ||
!strcmp(label, "detect_core_list") !strcmp(label, "detect_core_list")