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

Create MENU_SETTING_CTL_ACTION_RIGHT

This commit is contained in:
twinaphex 2016-03-18 23:31:11 +01:00
parent 033cf569e4
commit 1bf76bc1f6
3 changed files with 13 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
menu/menu_entry.c
View File

@ -188,7 +188,7 @@ void menu_entry_pathdir_selected(uint32_t i)
rarch_setting_t *setting = menu_entries_get_setting(i); rarch_setting_t *setting = menu_entries_get_setting(i);
if (menu_setting_ctl(MENU_SETTING_CTL_IS_OF_PATH_TYPE, (void*)setting)) if (menu_setting_ctl(MENU_SETTING_CTL_IS_OF_PATH_TYPE, (void*)setting))
menu_setting_action_right(setting, false); menu_setting_ctl(MENU_SETTING_CTL_ACTION_RIGHT, setting);
} }
bool menu_entry_pathdir_allow_empty(uint32_t i) bool menu_entry_pathdir_allow_empty(uint32_t i)

20
menu/menu_setting.c
View File

@ -7347,16 +7347,6 @@ static bool setting_append_list_privacy_options(
return true; return true;
} }
bool menu_setting_action_right(rarch_setting_t *setting, bool wraparound)
{
if (!setting || !setting->action_right)
return false;
setting->action_right(setting, wraparound);
return true;
}
static bool menu_setting_free(void *data) static bool menu_setting_free(void *data)
{ {
rarch_setting_t *setting = (rarch_setting_t*)data; rarch_setting_t *setting = (rarch_setting_t*)data;
@ -7580,6 +7570,16 @@ bool menu_setting_ctl(enum menu_setting_ctl_state state, void *data)
*setting = menu_setting_new(); *setting = menu_setting_new();
} }
break; break;
case MENU_SETTING_CTL_ACTION_RIGHT:
{
bool wraparound = false;
rarch_setting_t *setting = (rarch_setting_t*)data;
if (!setting || !setting->action_right)
return false;
setting->action_right(setting, wraparound);
}
break;
case MENU_SETTING_CTL_NONE: case MENU_SETTING_CTL_NONE:
default: default:
break; break;

5
menu/menu_setting.h
View File

@ -68,7 +68,8 @@ enum menu_setting_ctl_state
MENU_SETTING_CTL_NONE = 0, MENU_SETTING_CTL_NONE = 0,
MENU_SETTING_CTL_FREE, MENU_SETTING_CTL_FREE,
MENU_SETTING_CTL_NEW, MENU_SETTING_CTL_NEW,
MENU_SETTING_CTL_IS_OF_PATH_TYPE MENU_SETTING_CTL_IS_OF_PATH_TYPE,
MENU_SETTING_CTL_ACTION_RIGHT
}; };
enum setting_list_flags enum setting_list_flags
@ -348,8 +349,6 @@ unsigned menu_setting_get_index_offset(rarch_setting_t *setting);
void *setting_get_ptr(rarch_setting_t *setting); void *setting_get_ptr(rarch_setting_t *setting);
bool menu_setting_action_right(rarch_setting_t *setting, bool wraparound);
void menu_settings_list_increment(rarch_setting_t **list); void menu_settings_list_increment(rarch_setting_t **list);
void general_write_handler(void *data); void general_write_handler(void *data);