Hide 'Core Settings' and 'Logging Settings' entirely when

'Show Advanced Settings' is OFF
This commit is contained in:
twinaphex 2015-06-15 03:57:01 +02:00
parent 3139f13612
commit 6d6cb1c023
2 changed files with 19 additions and 7 deletions

View File

@ -1267,13 +1267,18 @@ static int menu_displaylist_parse_settings(menu_handle_t *menu,
for (; setting->type != ST_END_GROUP; setting++)
{
if (
setting->type == ST_GROUP
|| setting->type == ST_SUB_GROUP
|| setting->type == ST_END_SUB_GROUP
|| (setting->flags & SD_FLAG_ADVANCED &&
!settings->menu.show_advanced_settings)
)
switch (setting->type)
{
case ST_GROUP:
case ST_SUB_GROUP:
case ST_END_SUB_GROUP:
continue;
default:
break;
}
if (setting->flags & SD_FLAG_ADVANCED &&
!settings->menu.show_advanced_settings)
continue;
menu_list_push(info->list, setting->short_description,
@ -1923,8 +1928,13 @@ int menu_displaylist_push_list(menu_displaylist_info_t *info, unsigned type)
for (; setting->type != ST_NONE; setting++)
{
if (setting->type == ST_GROUP)
{
if (setting->flags & SD_FLAG_ADVANCED &&
!settings->menu.show_advanced_settings)
continue;
menu_list_push(info->list, setting->short_description,
setting->name, menu_setting_set_flags(setting), 0, 0);
}
}
}
else

View File

@ -3898,6 +3898,7 @@ static bool setting_append_list_core_options(
settings_t *settings = config_get_ptr();
START_GROUP(group_info, "Core Settings", parent_group);
settings_data_list_current_add_flags(list, list_info, SD_FLAG_ADVANCED);
parent_group = "Settings";
@ -4155,6 +4156,7 @@ static bool setting_append_list_logging_options(
global_t *global = global_get_ptr();
START_GROUP(group_info, "Logging Settings", parent_group);
settings_data_list_current_add_flags(list, list_info, SD_FLAG_ADVANCED);
parent_group = "Settings";