mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-03-26 02:37:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

(iOS) Cleanups

Browse Source
This commit is contained in:
Twinaphex 2015-05-06 04:47:02 +02:00
parent c5568d5afa
commit d876ba8130
1 changed files with 26 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
ui/drivers/cocoa/cocoatouch_menu.m
View File

@ -809,30 +809,38 @@ void get_core_title(char *title_msg, size_t title_msg_len)
(menu->list_settings, (menu->list_settings,
menu->menu_list->selection_buf->list[i].label); menu->menu_list->selection_buf->list[i].label);
if (setting && setting->type == ST_ACTION && if (setting_is_of_path_type(setting))
setting->flags & SD_FLAG_BROWSER_ACTION && {
setting->action_toggle &&
setting->change_handler) {
return [[RAMenuItemPathSetting alloc] return [[RAMenuItemPathSetting alloc]
initWithSetting:setting initWithSetting:setting
action:^{}]; action:^{}];
} else if (setting && setting->type == ST_BOOL ) { }
else if (setting && setting->type == ST_BOOL )
{
return [[RAMenuItemBooleanSetting alloc] return [[RAMenuItemBooleanSetting alloc]
initWithSetting:setting initWithSetting:setting
action:^{[weakSelf menuSelect: i];}]; action:^{[weakSelf menuSelect: i];}];
} else if (setting && ST_PATH <= setting->type && setting->type <= ST_DIR) { }
else if (setting && ST_PATH <= setting->type && setting->type <= ST_DIR)
{
return [[RAMenuItemPathSetting alloc] return [[RAMenuItemPathSetting alloc]
initWithSetting:setting initWithSetting:setting
action:^{[weakSelf menuSelect: i];}]; action:^{[weakSelf menuSelect: i];}];
} else if (setting && setting->type == ST_BIND ) { }
else if (setting && setting->type == ST_BIND )
{
return [[RAMenuItemBindSetting alloc] return [[RAMenuItemBindSetting alloc]
initWithSetting:setting initWithSetting:setting
action:^{[weakSelf menuSelect: i];}]; action:^{[weakSelf menuSelect: i];}];
} else if (setting && setting->type == ST_STRING && setting->values ) { }
else if (setting_is_of_enum_type(setting))
{
return [[RAMenuItemEnumSetting alloc] return [[RAMenuItemEnumSetting alloc]
initWithSetting:setting initWithSetting:setting
action:^{[weakSelf menuSelect: i];}]; action:^{[weakSelf menuSelect: i];}];
} else if (setting && ST_INT <= setting->type && setting->type <= ST_HEX) { }
else if (setting && ST_INT <= setting->type && setting->type <= ST_HEX)
{
RAMenuItemGeneralSetting* item = RAMenuItemGeneralSetting* item =
[[RAMenuItemGeneralSetting alloc] [[RAMenuItemGeneralSetting alloc]
initWithSetting:setting initWithSetting:setting
@ -844,11 +852,14 @@ void get_core_title(char *title_msg, size_t title_msg_len)
item.formatter = [[RANumberFormatter alloc] initWithSetting:item.setting]; item.formatter = [[RANumberFormatter alloc] initWithSetting:item.setting];
return item; return item;
} else { // This is for ST_GROUP/etc }
else
{ // This is for ST_GROUP/etc
cbs = (menu_file_list_cbs_t*) cbs = (menu_file_list_cbs_t*)
menu_list_get_actiondata_at_offset(menu->menu_list->selection_buf, i); menu_list_get_actiondata_at_offset(menu->menu_list->selection_buf, i);
if (cbs && cbs->action_get_representation) { if (cbs && cbs->action_get_representation)
{
cbs->action_get_representation cbs->action_get_representation
(menu->menu_list->selection_buf, (menu->menu_list->selection_buf,
&w, type, i, label, &w, type, i, label,
@ -865,14 +876,16 @@ void get_core_title(char *title_msg, size_t title_msg_len)
- (void)menuSelect: (uint) i - (void)menuSelect: (uint) i
{ {
if (menu_select_entry(i)) { if (menu_select_entry(i))
{
[self menuRefresh]; [self menuRefresh];
[self reloadData]; [self reloadData];
} }
} }
// JM: This could be moved down to RA // JM: This could be moved down to RA
uint menu_select_entry(uint i) { uint menu_select_entry(uint i)
{
menu_handle_t *menu = menu_driver_get_ptr(); menu_handle_t *menu = menu_driver_get_ptr();
rarch_setting_t *setting; rarch_setting_t *setting;
menu_file_list_cbs_t *cbs = NULL; menu_file_list_cbs_t *cbs = NULL;