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

Show UI menubar setting

Browse Source
This commit is contained in:
twinaphex 2019-07-19 20:00:31 +02:00
parent f787e77c25
commit eebfa11528
4 changed files with 45 additions and 32 deletions

2
config.def.h

@ -898,6 +898,8 @@ static const bool content_runtime_log = false;
/* Keep track of how long each content has been running for over time (ignores core) */ /* Keep track of how long each content has been running for over time (ignores core) */
static const bool content_runtime_log_aggregate = false; static const bool content_runtime_log_aggregate = false;
#define DEFAULT_UI_MENUBAR_ENABLE true
#if defined(__QNX__) || defined(_XBOX1) || defined(_XBOX360) || defined(__CELLOS_LV2__) || (defined(__MACH__) && defined(IOS)) || defined(ANDROID) || defined(WIIU) || defined(HAVE_NEON) || defined(GEKKO) || defined(__ARM_NEON__) #if defined(__QNX__) || defined(_XBOX1) || defined(_XBOX360) || defined(__CELLOS_LV2__) || (defined(__MACH__) && defined(IOS)) || defined(ANDROID) || defined(WIIU) || defined(HAVE_NEON) || defined(GEKKO) || defined(__ARM_NEON__)
static enum resampler_quality audio_resampler_quality_level = RESAMPLER_QUALITY_LOWER; static enum resampler_quality audio_resampler_quality_level = RESAMPLER_QUALITY_LOWER;
#elif defined(PSP) || defined(_3DS) || defined(VITA) || defined(PS2) #elif defined(PSP) || defined(_3DS) || defined(VITA) || defined(PS2)

2
configuration.c

@ -1370,7 +1370,7 @@ static struct config_bool_setting *populate_settings_bool(settings_t *settings,
SETTING_BOOL("statistics_show", &settings->bools.video_statistics_show, true, DEFAULT_STATISTICS_SHOW, false); SETTING_BOOL("statistics_show", &settings->bools.video_statistics_show, true, DEFAULT_STATISTICS_SHOW, false);
SETTING_BOOL("framecount_show", &settings->bools.video_framecount_show, true, DEFAULT_FRAMECOUNT_SHOW, false); SETTING_BOOL("framecount_show", &settings->bools.video_framecount_show, true, DEFAULT_FRAMECOUNT_SHOW, false);
SETTING_BOOL("memory_show", &settings->bools.video_memory_show, true, DEFAULT_MEMORY_SHOW, false); SETTING_BOOL("memory_show", &settings->bools.video_memory_show, true, DEFAULT_MEMORY_SHOW, false);
SETTING_BOOL("ui_menubar_enable", &settings->bools.ui_menubar_enable, true, true, false); SETTING_BOOL("ui_menubar_enable", &settings->bools.ui_menubar_enable, true, DEFAULT_UI_MENUBAR_ENABLE, false);
SETTING_BOOL("suspend_screensaver_enable", &settings->bools.ui_suspend_screensaver_enable, true, true, false); SETTING_BOOL("suspend_screensaver_enable", &settings->bools.ui_suspend_screensaver_enable, true, true, false);
SETTING_BOOL("rewind_enable", &settings->bools.rewind_enable, true, DEFAULT_REWIND_ENABLE, false); SETTING_BOOL("rewind_enable", &settings->bools.rewind_enable, true, DEFAULT_REWIND_ENABLE, false);
SETTING_BOOL("vrr_runloop_enable", &settings->bools.vrr_runloop_enable, true, DEFAULT_VRR_RUNLOOP_ENABLE, false); SETTING_BOOL("vrr_runloop_enable", &settings->bools.vrr_runloop_enable, true, DEFAULT_VRR_RUNLOOP_ENABLE, false);

2
intl/msg_hash_us.h

@ -3512,7 +3512,7 @@ MSG_HASH(
) )
MSG_HASH( MSG_HASH(
MENU_ENUM_LABEL_VALUE_UI_MENUBAR_ENABLE, MENU_ENUM_LABEL_VALUE_UI_MENUBAR_ENABLE,
"Menubar" "Menu Bar"
) )
MSG_HASH( MSG_HASH(
MENU_ENUM_LABEL_VALUE_UNABLE_TO_READ_COMPRESSED_FILE, MENU_ENUM_LABEL_VALUE_UNABLE_TO_READ_COMPRESSED_FILE,

71
menu/menu_setting.c

@ -13158,13 +13158,19 @@ static bool setting_append_list(
general_write_handler, general_write_handler,
general_read_handler, general_read_handler,
SD_FLAG_ADVANCED); SD_FLAG_ADVANCED);
}
#if defined(_WIN32) && !defined(_XBOX) && !defined(__WINRT__)
#else
if (string_is_not_equal(ui_companion_driver_get_ident(), "null"))
#endif
{
CONFIG_BOOL( CONFIG_BOOL(
list, list_info, list, list_info,
&settings->bools.ui_menubar_enable, &settings->bools.ui_menubar_enable,
MENU_ENUM_LABEL_UI_MENUBAR_ENABLE, MENU_ENUM_LABEL_UI_MENUBAR_ENABLE,
MENU_ENUM_LABEL_VALUE_UI_MENUBAR_ENABLE, MENU_ENUM_LABEL_VALUE_UI_MENUBAR_ENABLE,
true, DEFAULT_UI_MENUBAR_ENABLE,
MENU_ENUM_LABEL_VALUE_OFF, MENU_ENUM_LABEL_VALUE_OFF,
MENU_ENUM_LABEL_VALUE_ON, MENU_ENUM_LABEL_VALUE_ON,
&group_info, &group_info,
@ -13174,37 +13180,42 @@ static bool setting_append_list(
general_read_handler, general_read_handler,
SD_FLAG_NONE); SD_FLAG_NONE);
} }
#ifdef HAVE_QT
CONFIG_BOOL(
list, list_info,
&settings->bools.desktop_menu_enable,
MENU_ENUM_LABEL_DESKTOP_MENU_ENABLE,
MENU_ENUM_LABEL_VALUE_DESKTOP_MENU_ENABLE,
desktop_menu_enable,
MENU_ENUM_LABEL_VALUE_OFF,
MENU_ENUM_LABEL_VALUE_ON,
&group_info,
&subgroup_info,
parent_group,
general_write_handler,
general_read_handler,
SD_FLAG_NONE);
CONFIG_BOOL( if (string_is_not_equal(ui_companion_driver_get_ident(), "null"))
list, list_info, {
&settings->bools.ui_companion_toggle, #ifdef HAVE_QT
MENU_ENUM_LABEL_UI_COMPANION_TOGGLE, CONFIG_BOOL(
MENU_ENUM_LABEL_VALUE_UI_COMPANION_TOGGLE, list, list_info,
ui_companion_toggle, &settings->bools.desktop_menu_enable,
MENU_ENUM_LABEL_VALUE_OFF, MENU_ENUM_LABEL_DESKTOP_MENU_ENABLE,
MENU_ENUM_LABEL_VALUE_ON, MENU_ENUM_LABEL_VALUE_DESKTOP_MENU_ENABLE,
&group_info, desktop_menu_enable,
&subgroup_info, MENU_ENUM_LABEL_VALUE_OFF,
parent_group, MENU_ENUM_LABEL_VALUE_ON,
general_write_handler, &group_info,
general_read_handler, &subgroup_info,
SD_FLAG_NONE); parent_group,
general_write_handler,
general_read_handler,
SD_FLAG_NONE);
CONFIG_BOOL(
list, list_info,
&settings->bools.ui_companion_toggle,
MENU_ENUM_LABEL_UI_COMPANION_TOGGLE,
MENU_ENUM_LABEL_VALUE_UI_COMPANION_TOGGLE,
ui_companion_toggle,
MENU_ENUM_LABEL_VALUE_OFF,
MENU_ENUM_LABEL_VALUE_ON,
&group_info,
&subgroup_info,
parent_group,
general_write_handler,
general_read_handler,
SD_FLAG_NONE);
#endif #endif
}
END_SUB_GROUP(list, list_info, parent_group); END_SUB_GROUP(list, list_info, parent_group);
END_GROUP(list, list_info, parent_group); END_GROUP(list, list_info, parent_group);
break; break;