Move some more label representation code from settings_data.c to

menu_entries_cbs.c
This commit is contained in:
twinaphex 2015-02-01 08:48:52 +01:00
parent 3a9bbff1be
commit e58d1dec21
2 changed files with 20 additions and 5 deletions

View File

@ -4040,6 +4040,20 @@ static void menu_action_setting_disp_set_label_menu_file_core(
strlcpy(path_buf, alt, path_buf_size);
}
static void menu_action_setting_disp_set_label_menu_more(
file_list_t* list,
unsigned *w, unsigned type, unsigned i,
const char *label,
char *type_str, size_t type_str_size,
const char *entry_label,
const char *path,
char *path_buf, size_t path_buf_size)
{
strlcpy(type_str, "...", type_str_size);
*w = 19;
strlcpy(path_buf, path, path_buf_size);
}
static void menu_action_setting_disp_set_label_menu_file_plain(
file_list_t* list,
unsigned *w, unsigned type, unsigned i,
@ -4859,6 +4873,12 @@ static void menu_entries_cbs_init_bind_get_string_representation(menu_file_list_
cbs->action_get_representation =
menu_action_setting_disp_set_label_menu_file_subgroup;
break;
case MENU_SETTINGS_CUSTOM_VIEWPORT:
case MENU_SETTINGS_CUSTOM_BIND_ALL:
case MENU_SETTINGS_CUSTOM_BIND_DEFAULT_ALL:
cbs->action_get_representation =
menu_action_setting_disp_set_label_menu_more;
break;
default:
cbs->action_get_representation = menu_action_setting_disp_set_label;
break;

View File

@ -2817,11 +2817,6 @@ static int get_fallback_label(char *type_str,
}
break;
#endif
case MENU_SETTINGS_CUSTOM_VIEWPORT:
case MENU_SETTINGS_CUSTOM_BIND_ALL:
case MENU_SETTINGS_CUSTOM_BIND_DEFAULT_ALL:
strlcpy(type_str, "...", type_str_size);
break;
case MENU_SETTINGS_CORE_DISK_OPTIONS_DISK_INDEX:
{
const struct retro_disk_control_callback *control =