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

(XMB+OZONE) Quick Menu ports: AtD icon + key labels for keyboard type

Browse Source
This commit is contained in:
Tony Jansson 2020-08-19 17:35:15 +03:00
parent f4c6c26312
commit 1c7d8d3f31
4 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
menu/drivers/ozone/ozone_texture.c
View File

@ -439,6 +439,8 @@ uintptr_t ozone_entries_icon_get_texture(ozone_handle_t *ozone,
#endif #endif
case MENU_SETTING_ACTION: case MENU_SETTING_ACTION:
return ozone->icons_textures[OZONE_ENTRIES_ICONS_TEXTURE_SETTING]; return ozone->icons_textures[OZONE_ENTRIES_ICONS_TEXTURE_SETTING];
case MENU_SETTINGS_INPUT_ANALOG_DPAD_MODE:
return ozone->icons_textures[OZONE_ENTRIES_ICONS_TEXTURE_INPUT_ADC];
} }
#ifdef HAVE_CHEEVOS #ifdef HAVE_CHEEVOS

2
menu/drivers/xmb.c
View File

@ -2850,6 +2850,8 @@ static uintptr_t xmb_icon_get_id(xmb_handle_t *xmb,
case MENU_ROOM_RELAY: case MENU_ROOM_RELAY:
return xmb->textures.list[XMB_TEXTURE_ROOM_RELAY]; return xmb->textures.list[XMB_TEXTURE_ROOM_RELAY];
#endif #endif
case MENU_SETTINGS_INPUT_ANALOG_DPAD_MODE:
return xmb->textures.list[XMB_TEXTURE_INPUT_ADC];
} }
#ifdef HAVE_CHEEVOS #ifdef HAVE_CHEEVOS

7
menu/menu_displaylist.c
View File

@ -8998,7 +8998,7 @@ bool menu_displaylist_ctl(enum menu_displaylist_ctl_state type,
key_type, PARSE_ONLY_UINT, true, 0) == 0) key_type, PARSE_ONLY_UINT, true, 0) == 0)
count++; count++;
if (MENU_DISPLAYLIST_PARSE_SETTINGS(list, if (MENU_DISPLAYLIST_PARSE_SETTINGS(list,
key_analog, PARSE_ONLY_UINT, true, 0) == 0) key_analog, PARSE_ONLY_UINT, true, MENU_SETTINGS_INPUT_ANALOG_DPAD_MODE) == 0)
count++; count++;
} }
@ -9070,8 +9070,9 @@ bool menu_displaylist_ctl(enum menu_displaylist_ctl_state type,
const struct retro_keybind *keyptr = const struct retro_keybind *keyptr =
&input_config_binds[p][retro_id]; &input_config_binds[p][retro_id];
strlcpy(descriptor, snprintf(desc_label, sizeof(desc_label),
msg_hash_to_str(keyptr->enum_idx), sizeof(descriptor)); "%s %s", msg_hash_to_str(keyptr->enum_idx), descriptor);
strlcpy(descriptor, desc_label, sizeof(descriptor));
} }
/* Add user index when display driver == rgui and sublabels /* Add user index when display driver == rgui and sublabels

3
menu/menu_driver.h
View File

@ -178,6 +178,8 @@ enum menu_settings_type
MENU_SETTINGS_PERF_COUNTERS_END = MENU_SETTINGS_PERF_COUNTERS_BEGIN + (MAX_COUNTERS - 1), MENU_SETTINGS_PERF_COUNTERS_END = MENU_SETTINGS_PERF_COUNTERS_BEGIN + (MAX_COUNTERS - 1),
MENU_SETTINGS_CHEAT_BEGIN, MENU_SETTINGS_CHEAT_BEGIN,
MENU_SETTINGS_CHEAT_END = MENU_SETTINGS_CHEAT_BEGIN + (MAX_CHEAT_COUNTERS - 1), MENU_SETTINGS_CHEAT_END = MENU_SETTINGS_CHEAT_BEGIN + (MAX_CHEAT_COUNTERS - 1),
MENU_SETTINGS_INPUT_ANALOG_DPAD_MODE,
MENU_SETTINGS_INPUT_BEGIN, MENU_SETTINGS_INPUT_BEGIN,
MENU_SETTINGS_INPUT_END = MENU_SETTINGS_INPUT_BEGIN + RARCH_CUSTOM_BIND_LIST_END + 6, MENU_SETTINGS_INPUT_END = MENU_SETTINGS_INPUT_BEGIN + RARCH_CUSTOM_BIND_LIST_END + 6,
MENU_SETTINGS_INPUT_DESC_BEGIN, MENU_SETTINGS_INPUT_DESC_BEGIN,
@ -188,7 +190,6 @@ enum menu_settings_type
MENU_SETTINGS_REMAPPING_PORT_END = MENU_SETTINGS_REMAPPING_PORT_BEGIN + (MAX_USERS), MENU_SETTINGS_REMAPPING_PORT_END = MENU_SETTINGS_REMAPPING_PORT_BEGIN + (MAX_USERS),
MENU_SETTINGS_SUBSYSTEM_LOAD, MENU_SETTINGS_SUBSYSTEM_LOAD,
MENU_SETTINGS_SUBSYSTEM_ADD, MENU_SETTINGS_SUBSYSTEM_ADD,
MENU_SETTINGS_SUBSYSTEM_LAST = MENU_SETTINGS_SUBSYSTEM_ADD + RARCH_MAX_SUBSYSTEMS, MENU_SETTINGS_SUBSYSTEM_LAST = MENU_SETTINGS_SUBSYSTEM_ADD + RARCH_MAX_SUBSYSTEMS,
MENU_SETTINGS_CHEAT_MATCH, MENU_SETTINGS_CHEAT_MATCH,