mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-02-11 15:40:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

(RGUI) RGUI_ACTION_SETTINGS was deprecated - get rid of it

Browse Source
This commit is contained in:
twinaphex 2013-09-27 17:00:00 +02:00
parent 7056edf143
commit af8caf45f7
3 changed files with 1 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
frontend/menu/menu_common.c
View File

@ -744,10 +744,8 @@ bool menu_iterate(void)
action = RGUI_ACTION_CANCEL; action = RGUI_ACTION_CANCEL;
else if (rgui->trigger_state & (1ULL << RETRO_DEVICE_ID_JOYPAD_A)) else if (rgui->trigger_state & (1ULL << RETRO_DEVICE_ID_JOYPAD_A))
action = RGUI_ACTION_OK; action = RGUI_ACTION_OK;
else if (rgui->trigger_state & (1ULL << RETRO_DEVICE_ID_JOYPAD_SELECT))
action = RGUI_ACTION_START;
else if (rgui->trigger_state & (1ULL << RETRO_DEVICE_ID_JOYPAD_START)) else if (rgui->trigger_state & (1ULL << RETRO_DEVICE_ID_JOYPAD_START))
action = RGUI_ACTION_SETTINGS; action = RGUI_ACTION_START;
if (menu_ctx && menu_ctx->iterate) if (menu_ctx && menu_ctx->iterate)
input_entry_ret = menu_ctx->iterate(rgui, action); input_entry_ret = menu_ctx->iterate(rgui, action);

1
frontend/menu/menu_common.h
View File

@ -174,7 +174,6 @@ typedef enum
RGUI_ACTION_OK, RGUI_ACTION_OK,
RGUI_ACTION_CANCEL, RGUI_ACTION_CANCEL,
RGUI_ACTION_REFRESH, RGUI_ACTION_REFRESH,
RGUI_ACTION_SETTINGS,
RGUI_ACTION_START, RGUI_ACTION_START,
RGUI_ACTION_MESSAGE, RGUI_ACTION_MESSAGE,
RGUI_ACTION_SCROLL_DOWN, RGUI_ACTION_SCROLL_DOWN,

10
frontend/menu/rgui.c
View File

@ -2292,10 +2292,6 @@ static int rgui_viewport_iterate(rgui_handle_t *rgui, rgui_action_t action)
} }
break; break;
case RGUI_ACTION_SETTINGS:
rgui_list_pop(rgui->menu_stack, &rgui->selection_ptr);
break;
case RGUI_ACTION_MESSAGE: case RGUI_ACTION_MESSAGE:
rgui->msg_force = true; rgui->msg_force = true;
break; break;
@ -2892,12 +2888,6 @@ static int rgui_iterate(void *data, unsigned action)
rgui->need_refresh = true; rgui->need_refresh = true;
break; break;
case RGUI_ACTION_SETTINGS:
rgui->need_refresh = true;
while (rgui->menu_stack->size > 1)
rgui_list_pop(rgui->menu_stack, &rgui->selection_ptr);
return rgui_settings_iterate(rgui, RGUI_ACTION_REFRESH);
case RGUI_ACTION_MESSAGE: case RGUI_ACTION_MESSAGE:
rgui->msg_force = true; rgui->msg_force = true;
break; break;