mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-03-29 13:20:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

(RMenu) Add Settings link to Quick Menu

Browse Source
This commit is contained in:
twinaphex 2013-04-27 03:50:42 +02:00
parent f3c782a6af
commit 5f449fc870
3 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
frontend/menu/menu_common.c
View File

@ -444,7 +444,9 @@ bool menu_iterate(void)
rgui->need_refresh = true;
g_extern.lifecycle_mode_state &= ~(1ULL << MODE_MENU_PREINIT);
#ifdef HAVE_RGUI
rgui->old_input_state |= 1ULL << DEVICE_NAV_MENU;
#endif
}
rarch_input_poll();

19
frontend/menu/rmenu.c
View File

@ -1624,6 +1624,12 @@ static int set_setting_action(uint8_t menu_type, unsigned switchvalue, uint64_t
return 0;
}
break;
case INGAME_MENU_SETTINGS:
if (input & (1ULL << DEVICE_NAV_B))
{
menu_stack_push(GENERAL_VIDEO_MENU, false);
}
break;
case INGAME_MENU_RESET:
if (input & (1ULL << DEVICE_NAV_B))
{
@ -2316,6 +2322,11 @@ static int select_setting(void *data, uint64_t input)
strlcpy(setting_text, "", sizeof(setting_text));
strlcpy(comment, "Choose another libretro core.", sizeof(comment));
break;
case INGAME_MENU_SETTINGS:
strlcpy(text, "Settings...", sizeof(text));
strlcpy(setting_text, "", sizeof(setting_text));
strlcpy(comment, "Change RetroArch settings.", sizeof(comment));
break;
#ifdef HAVE_MULTIMAN
case INGAME_MENU_RETURN_TO_MULTIMAN:
strlcpy(text, "Return to multiMAN", sizeof(text));
@ -2537,9 +2548,7 @@ static int select_rom(void *data, uint64_t input)
filebrowser_update(rgui->browser, input, rgui->info.valid_extensions);
if (input & (1ULL << DEVICE_NAV_SELECT))
menu_stack_push(GENERAL_VIDEO_MENU, false);
else if (input & (1ULL << DEVICE_NAV_B))
if (input & (1ULL << DEVICE_NAV_B))
{
if (filebrowser_iterate(rgui->browser, FILEBROWSER_ACTION_PATH_ISDIR))
{
@ -2688,7 +2697,6 @@ static int ingame_menu_resize(void *data, uint64_t input)
struct platform_bind key_label_l2 = {0};
struct platform_bind key_label_r1 = {0};
struct platform_bind key_label_r2 = {0};
struct platform_bind key_label_select = {0};
struct platform_bind key_label_dpad_left = {0};
struct platform_bind key_label_dpad_right = {0};
struct platform_bind key_label_dpad_up = {0};
@ -2710,8 +2718,6 @@ static int ingame_menu_resize(void *data, uint64_t input)
key_label_l2.joykey = 1ULL << RETRO_DEVICE_ID_JOYPAD_L2;
strlcpy(key_label_r2.desc, "Unknown", sizeof(key_label_r2.desc));
key_label_r2.joykey = 1ULL << RETRO_DEVICE_ID_JOYPAD_R2;
strlcpy(key_label_select.desc, "Unknown", sizeof(key_label_select.desc));
key_label_select.joykey = 1ULL << RETRO_DEVICE_ID_JOYPAD_SELECT;
strlcpy(key_label_dpad_left.desc, "Unknown", sizeof(key_label_dpad_left.desc));
key_label_dpad_left.joykey = 1ULL << RETRO_DEVICE_ID_JOYPAD_LEFT;
strlcpy(key_label_dpad_right.desc, "Unknown", sizeof(key_label_dpad_left.desc));
@ -2727,7 +2733,6 @@ static int ingame_menu_resize(void *data, uint64_t input)
driver.input->set_keybinds(&key_label_r1, 0, 0, 0, (1ULL << KEYBINDS_ACTION_GET_BIND_LABEL));
driver.input->set_keybinds(&key_label_l2, 0, 0, 0, (1ULL << KEYBINDS_ACTION_GET_BIND_LABEL));
driver.input->set_keybinds(&key_label_r2, 0, 0, 0, (1ULL << KEYBINDS_ACTION_GET_BIND_LABEL));
driver.input->set_keybinds(&key_label_select, 0, 0, 0, (1ULL << KEYBINDS_ACTION_GET_BIND_LABEL));
driver.input->set_keybinds(&key_label_b, 0, 0, 0, (1ULL << KEYBINDS_ACTION_GET_BIND_LABEL));
driver.input->set_keybinds(&key_label_a, 0, 0, 0, (1ULL << KEYBINDS_ACTION_GET_BIND_LABEL));
driver.input->set_keybinds(&key_label_y, 0, 0, 0, (1ULL << KEYBINDS_ACTION_GET_BIND_LABEL));

1
frontend/menu/rmenu.h
View File

@ -151,6 +151,7 @@ enum
#ifdef HAVE_SHADER_MANAGER
INGAME_MENU_SHADER_MANAGER_MODE,
#endif
INGAME_MENU_SETTINGS,
INGAME_MENU_LOAD_STATE,
INGAME_MENU_SAVE_STATE,
INGAME_MENU_SCREENSHOT_MODE,