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

Fix setting iOS app icon (#16107)

Browse Source
This commit is contained in:
Eric Warmenhoven 2024-01-11 08:48:54 -05:00 committed by GitHub
parent 850fedb43c
commit 6c57b31ce5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 42 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
menu/menu_displaylist.c
View File

@ -9036,7 +9036,11 @@ unsigned menu_displaylist_build_list(
switch (build_list[i].enum_idx) switch (build_list[i].enum_idx)
{ {
case MENU_ENUM_LABEL_APPICON_SETTINGS: case MENU_ENUM_LABEL_APPICON_SETTINGS:
build_list[i].checked = (uico_st->drv && uico_st->drv->set_app_icon); if (uico_st->drv && uico_st->drv->get_app_icons)
{
struct string_list *icons = uico_st->drv->get_app_icons();
build_list[i].checked = icons && icons->size > 1;
}
break; break;
case MENU_ENUM_LABEL_ONSCREEN_DISPLAY_SETTINGS: case MENU_ENUM_LABEL_ONSCREEN_DISPLAY_SETTINGS:
build_list[i].checked = settings->bools.settings_show_onscreen_display; build_list[i].checked = settings->bools.settings_show_onscreen_display;

43
menu/menu_setting.c
View File

@ -19530,33 +19530,22 @@ static bool setting_append_list(
START_SUB_GROUP(list, list_info, "State", &group_info, &subgroup_info, parent_group); START_SUB_GROUP(list, list_info, "State", &group_info, &subgroup_info, parent_group);
{ {
uico_driver_state_t *uico_st = uico_state_get_ptr(); CONFIG_STRING_OPTIONS(
struct string_list *icons; list, list_info,
if (uico_st->drv && uico_st->drv->get_app_icons && (icons = uico_st->drv->get_app_icons()) && icons->size) settings->paths.app_icon,
{ sizeof(settings->paths.app_icon),
char *options; MENU_ENUM_LABEL_APPICON_SETTINGS,
int len = 0, i = 0; MENU_ENUM_LABEL_VALUE_APPICON_SETTINGS,
for (; i < (int)icons->size; i++) "",
len += strlen(icons->elems[i].data) + 1; (char*)calloc(1, sizeof(char)),
options = (char*)calloc(len, sizeof(char)); &group_info,
string_list_join_concat(options, len, icons, "|"); &subgroup_info,
CONFIG_STRING_OPTIONS( parent_group,
list, list_info, general_write_handler,
settings->paths.app_icon, general_read_handler);
sizeof(settings->paths.app_icon), SETTINGS_DATA_LIST_CURRENT_ADD_FLAGS(list, list_info, SD_FLAG_IS_DRIVER);
MENU_ENUM_LABEL_APPICON_SETTINGS, (*list)[list_info->index - 1].action_ok = setting_action_ok_uint;
MENU_ENUM_LABEL_VALUE_APPICON_SETTINGS, (*list)[list_info->index - 1].change_handler = appicon_change_handler;
icons->elems[0].data,
options,
&group_info,
&subgroup_info,
parent_group,
general_write_handler,
general_read_handler);
SETTINGS_DATA_LIST_CURRENT_ADD_FLAGS(list, list_info, SD_FLAG_IS_DRIVER);
(*list)[list_info->index - 1].action_ok = setting_action_ok_uint;
(*list)[list_info->index - 1].change_handler = appicon_change_handler;
}
} }
CONFIG_BOOL( CONFIG_BOOL(

21
ui/drivers/ui_cocoatouch.m
View File

@ -536,6 +536,27 @@ enum
rarch_main(argc, argv, NULL); rarch_main(argc, argv, NULL);
uico_driver_state_t *uico_st = uico_state_get_ptr();
rarch_setting_t *appicon_setting = menu_setting_find_enum(MENU_ENUM_LABEL_APPICON_SETTINGS);
struct string_list *icons;
if (appicon_setting && uico_st->drv && uico_st->drv->get_app_icons && (icons = uico_st->drv->get_app_icons()) && icons->size > 1)
{
appicon_setting->default_value.string = icons->elems[0].data;
int len = 0, i = 0;
const char *iconName = [[application alternateIconName] cStringUsingEncoding:kCFStringEncodingUTF8]; // need to ask uico_st for this
for (; i < (int)icons->size; i++)
{
len += strlen(icons->elems[i].data) + 1;
if (string_is_equal(iconName, icons->elems[i].data))
appicon_setting->value.target.string = icons->elems[i].data;
}
char *options = (char*)calloc(len, sizeof(char));
string_list_join_concat(options, len, icons, "|");
if (appicon_setting->values)
free((void*)appicon_setting->values);
appicon_setting->values = options;
}
rarch_start_draw_observer(); rarch_start_draw_observer();
#if TARGET_OS_IOS #if TARGET_OS_IOS