mirror of
https://github.com/libretro/RetroArch
synced 2025-03-02 19:13:34 +00:00
(XMB+OZONE) Proper control port icons
This commit is contained in:
parent
e4f8f64336
commit
cd77db37df
@ -442,6 +442,8 @@ uintptr_t ozone_entries_icon_get_texture(ozone_handle_t *ozone,
|
||||
#endif
|
||||
case MENU_SETTING_ACTION:
|
||||
return ozone->icons_textures[OZONE_ENTRIES_ICONS_TEXTURE_SETTING];
|
||||
case MENU_SETTINGS_INPUT_LIBRETRO_DEVICE:
|
||||
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];
|
||||
}
|
||||
@ -471,10 +473,12 @@ uintptr_t ozone_entries_icon_get_texture(ozone_handle_t *ozone,
|
||||
if (type < MENU_SETTINGS_INPUT_DESC_BEGIN)
|
||||
{
|
||||
input_id = MENU_SETTINGS_INPUT_BEGIN;
|
||||
if (type == input_id)
|
||||
return ozone->icons_textures[OZONE_ENTRIES_ICONS_TEXTURE_SETTING];
|
||||
if (type == input_id + 1)
|
||||
return ozone->icons_textures[OZONE_ENTRIES_ICONS_TEXTURE_INPUT_ADC];
|
||||
#ifdef HAVE_LIBNX
|
||||
// account for the additional split joycon option in Input User # Binds
|
||||
/* account for the additional split joycon option in Input User # Binds */
|
||||
input_id++;
|
||||
#endif
|
||||
if (type == input_id + 2)
|
||||
@ -560,6 +564,13 @@ uintptr_t ozone_entries_icon_get_texture(ozone_handle_t *ozone,
|
||||
if (type == (input_id + 23))
|
||||
return ozone->icons_textures[OZONE_ENTRIES_ICONS_TEXTURE_INPUT_STCK_U];
|
||||
}
|
||||
|
||||
if (
|
||||
(type >= MENU_SETTINGS_REMAPPING_PORT_BEGIN) &&
|
||||
(type <= MENU_SETTINGS_REMAPPING_PORT_END)
|
||||
)
|
||||
return ozone->icons_textures[OZONE_ENTRIES_ICONS_TEXTURE_INPUT_SETTINGS];
|
||||
|
||||
return ozone->icons_textures[OZONE_ENTRIES_ICONS_TEXTURE_SUBSETTING];
|
||||
}
|
||||
|
||||
|
@ -2876,6 +2876,8 @@ static uintptr_t xmb_icon_get_id(xmb_handle_t *xmb,
|
||||
case MENU_ROOM_RELAY:
|
||||
return xmb->textures.list[XMB_TEXTURE_ROOM_RELAY];
|
||||
#endif
|
||||
case MENU_SETTINGS_INPUT_LIBRETRO_DEVICE:
|
||||
return xmb->textures.list[XMB_TEXTURE_SETTING];
|
||||
case MENU_SETTINGS_INPUT_ANALOG_DPAD_MODE:
|
||||
return xmb->textures.list[XMB_TEXTURE_INPUT_ADC];
|
||||
}
|
||||
@ -2905,10 +2907,12 @@ static uintptr_t xmb_icon_get_id(xmb_handle_t *xmb,
|
||||
/* Input User # Binds only */
|
||||
{
|
||||
input_id = MENU_SETTINGS_INPUT_BEGIN;
|
||||
if ( type == input_id)
|
||||
return xmb->textures.list[XMB_TEXTURE_SETTING];
|
||||
if ( type == input_id + 1)
|
||||
return xmb->textures.list[XMB_TEXTURE_INPUT_ADC];
|
||||
#ifdef HAVE_LIBNX
|
||||
// account for the additional split joycon option in Input # Binds
|
||||
/* account for the additional split joycon option in Input # Binds */
|
||||
input_id++;
|
||||
#endif
|
||||
if ( type == input_id + 2)
|
||||
@ -2995,6 +2999,12 @@ static uintptr_t xmb_icon_get_id(xmb_handle_t *xmb,
|
||||
return xmb->textures.list[XMB_TEXTURE_INPUT_STCK_U];
|
||||
}
|
||||
|
||||
if (
|
||||
(type >= MENU_SETTINGS_REMAPPING_PORT_BEGIN) &&
|
||||
(type <= MENU_SETTINGS_REMAPPING_PORT_END)
|
||||
)
|
||||
return xmb->textures.list[XMB_TEXTURE_INPUT_SETTINGS];
|
||||
|
||||
if (checked)
|
||||
return xmb->textures.list[XMB_TEXTURE_CHECKMARK];
|
||||
|
||||
|
@ -9478,7 +9478,7 @@ bool menu_displaylist_ctl(enum menu_displaylist_ctl_state type,
|
||||
msg_hash_to_str(MENU_ENUM_LABEL_INPUT_PLAYER_ANALOG_DPAD_MODE), val);
|
||||
|
||||
if (MENU_DISPLAYLIST_PARSE_SETTINGS(list,
|
||||
key_type, PARSE_ONLY_UINT, true, 0) == 0)
|
||||
key_type, PARSE_ONLY_UINT, true, MENU_SETTINGS_INPUT_LIBRETRO_DEVICE) == 0)
|
||||
count++;
|
||||
if (MENU_DISPLAYLIST_PARSE_SETTINGS(list,
|
||||
key_analog, PARSE_ONLY_UINT, true, MENU_SETTINGS_INPUT_ANALOG_DPAD_MODE) == 0)
|
||||
|
@ -182,6 +182,7 @@ enum menu_settings_type
|
||||
MENU_SETTINGS_CHEAT_BEGIN,
|
||||
MENU_SETTINGS_CHEAT_END = MENU_SETTINGS_CHEAT_BEGIN + (MAX_CHEAT_COUNTERS - 1),
|
||||
|
||||
MENU_SETTINGS_INPUT_LIBRETRO_DEVICE,
|
||||
MENU_SETTINGS_INPUT_ANALOG_DPAD_MODE,
|
||||
MENU_SETTINGS_INPUT_BEGIN,
|
||||
MENU_SETTINGS_INPUT_END = MENU_SETTINGS_INPUT_BEGIN + RARCH_CUSTOM_BIND_LIST_END + 6,
|
||||
|
Loading…
x
Reference in New Issue
Block a user