Merge pull request #11180 from rsn8887/master

[SWITCH] Fix input bind icons being off by one line
This commit is contained in:
Autechre 2020-08-11 04:49:51 +02:00 committed by GitHub
commit c7f839a7fd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 0 deletions

View File

@ -468,6 +468,10 @@ uintptr_t ozone_entries_icon_get_texture(ozone_handle_t *ozone,
input_id = MENU_SETTINGS_INPUT_BEGIN;
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
input_id++;
#endif
if (type == input_id + 2)
return ozone->icons_textures[OZONE_ENTRIES_ICONS_TEXTURE_INPUT_SETTINGS];
if (type == input_id + 3)

View File

@ -2899,6 +2899,10 @@ static uintptr_t xmb_icon_get_id(xmb_handle_t *xmb,
input_id = MENU_SETTINGS_INPUT_BEGIN;
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
input_id++;
#endif
if ( type == input_id + 2)
return xmb->textures.list[XMB_TEXTURE_INPUT_SETTINGS];
if ( type == input_id + 3)