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

Core options work in RGUI.

This commit is contained in:
Themaister 2013-04-04 22:08:23 +02:00
parent 435eec44f0
commit d7797f8497
2 changed files with 38 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
frontend/menu/rgui.c
View File

@ -583,10 +583,38 @@ static void render_text(rgui_handle_t *rgui)
#define MAX_GAMMA_SETTING 1 #define MAX_GAMMA_SETTING 1
#endif #endif
static int rgui_core_setting_toggle(unsigned setting, rgui_action_t action)
{
unsigned index = setting - RGUI_SETTINGS_CORE_OPTION_START;
switch (action)
{
case RGUI_ACTION_LEFT:
core_option_prev(g_extern.system.core_options, index);
break;
case RGUI_ACTION_RIGHT:
case RGUI_ACTION_OK:
core_option_next(g_extern.system.core_options, index);
break;
case RGUI_ACTION_START:
core_option_set_default(g_extern.system.core_options, index);
break;
default:
break;
}
return 0;
}
static int rgui_settings_toggle_setting(unsigned setting, rgui_action_t action, unsigned menu_type) static int rgui_settings_toggle_setting(unsigned setting, rgui_action_t action, unsigned menu_type)
{ {
unsigned port = menu_type - RGUI_SETTINGS_CONTROLLER_1; unsigned port = menu_type - RGUI_SETTINGS_CONTROLLER_1;
if (setting >= RGUI_SETTINGS_CORE_OPTION_START)
return rgui_core_setting_toggle(setting, action);
switch (setting) switch (setting)
{ {
case RGUI_SETTINGS_REWIND_ENABLE: case RGUI_SETTINGS_REWIND_ENABLE:
@ -1049,12 +1077,15 @@ static void rgui_settings_core_options_populate_entries(rgui_handle_t *rgui)
{ {
rgui_list_clear(rgui->selection_buf); rgui_list_clear(rgui->selection_buf);
if (!g_extern.system.core_options) if (g_extern.system.core_options)
return; {
size_t opts = core_option_size(g_extern.system.core_options); size_t opts = core_option_size(g_extern.system.core_options);
for (size_t i = 0; i < opts; i++) for (size_t i = 0; i < opts; i++)
rgui_list_push(rgui->selection_buf, core_option_get_desc(g_extern.system.core_options, i), RGUI_SETTINGS_CORE_OPTION_START + i, 0); rgui_list_push(rgui->selection_buf,
core_option_get_desc(g_extern.system.core_options, i), RGUI_SETTINGS_CORE_OPTION_START + i, 0);
}
else
rgui_list_push(rgui->selection_buf, "No options available.", RGUI_SETTINGS_CORE_OPTION_NONE, 0);
} }
static void rgui_settings_controller_populate_entries(rgui_handle_t *rgui) static void rgui_settings_controller_populate_entries(rgui_handle_t *rgui)

1
frontend/menu/rgui.h
View File

@ -91,6 +91,7 @@ typedef enum
RGUI_SETTINGS_BIND_L3, RGUI_SETTINGS_BIND_L3,
RGUI_SETTINGS_BIND_R3, RGUI_SETTINGS_BIND_R3,
RGUI_SETTINGS_CORE_OPTION_NONE = 0xffff,
RGUI_SETTINGS_CORE_OPTION_START = 0x10000 RGUI_SETTINGS_CORE_OPTION_START = 0x10000
} rgui_file_type_t; } rgui_file_type_t;