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

Reimplement deferred push for category

This commit is contained in:
twinaphex 2014-10-15 22:04:02 +02:00
parent 9f314ef50d
commit 4d189d38c9
2 changed files with 36 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
frontend/menu/menu_entries.c
View File

@ -149,8 +149,6 @@ int push_list(menu_handle_t *menu,
const char *path, const char *label, const char *path, const char *label,
unsigned menu_type) unsigned menu_type)
{ {
unsigned i;
#if 0 #if 0
RARCH_LOG("Label is: %s\n", label); RARCH_LOG("Label is: %s\n", label);
RARCH_LOG("Path is: %s\n", path); RARCH_LOG("Path is: %s\n", path);
@ -179,40 +177,10 @@ int push_list(menu_handle_t *menu,
setting->name, setting_set_flags(setting), 0); setting->name, setting_set_flags(setting), 0);
} }
} }
else if (menu_type == MENU_FILE_CATEGORY)
{
settings_list_free(menu->list_settings);
menu->list_settings = (rarch_setting_t *)setting_data_new(SL_FLAG_ALL_SETTINGS);
rarch_setting_t *setting = (rarch_setting_t*)setting_data_find_setting(menu->list_settings,
label);
file_list_clear(list);
if (!strcmp(label, "Video Options"))
{
#if defined(GEKKO) || defined(__CELLOS_LV2__)
file_list_push(list, "Screen Resolution", "",
MENU_SETTINGS_VIDEO_RESOLUTION, 0);
#endif
file_list_push(list, "Custom Ratio", "",
MENU_SETTINGS_CUSTOM_VIEWPORT, 0);
}
for (; setting->type != ST_END_GROUP; setting++)
{
if (
setting->type == ST_GROUP ||
setting->type == ST_SUB_GROUP ||
setting->type == ST_END_SUB_GROUP
)
continue;
file_list_push(list, setting->short_description,
setting->name, setting_set_flags(setting), 0);
}
}
else if (!strcmp(label, "Input Options")) else if (!strcmp(label, "Input Options"))
{ {
unsigned i;
settings_list_free(menu->list_settings); settings_list_free(menu->list_settings);
menu->list_settings = (rarch_setting_t *)setting_data_new(SL_FLAG_ALL_SETTINGS); menu->list_settings = (rarch_setting_t *)setting_data_new(SL_FLAG_ALL_SETTINGS);

35
frontend/menu/menu_entries_cbs.c
View File

@ -1587,7 +1587,40 @@ static int deferred_push_category(void *data, void *userdata,
if (!list || !menu_list) if (!list || !menu_list)
return -1; return -1;
return push_list(driver.menu, list, path, label, type); settings_list_free(driver.menu->list_settings);
driver.menu->list_settings = (rarch_setting_t *)setting_data_new(SL_FLAG_ALL_SETTINGS);
rarch_setting_t *setting = (rarch_setting_t*)setting_data_find_setting(
driver.menu->list_settings, label);
file_list_clear(list);
if (!strcmp(label, "Video Options"))
{
#if defined(GEKKO) || defined(__CELLOS_LV2__)
file_list_push(list, "Screen Resolution", "",
MENU_SETTINGS_VIDEO_RESOLUTION, 0);
#endif
file_list_push(list, "Custom Ratio", "",
MENU_SETTINGS_CUSTOM_VIEWPORT, 0);
}
for (; setting->type != ST_END_GROUP; setting++)
{
if (
setting->type == ST_GROUP ||
setting->type == ST_SUB_GROUP ||
setting->type == ST_END_SUB_GROUP
)
continue;
file_list_push(list, setting->short_description,
setting->name, setting_set_flags(setting), 0);
}
if (driver.menu_ctx && driver.menu_ctx->populate_entries)
driver.menu_ctx->populate_entries(driver.menu, path, label, type);
return 0;
} }
static int deferred_push_input_options(void *data, void *userdata, static int deferred_push_input_options(void *data, void *userdata,