Merge pull request #11973 from sonninnos/input-port-labels

Input port label adjustments
This commit is contained in:
Autechre 2021-02-03 06:14:37 +01:00 committed by GitHub
commit 06bb026f5c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -287,6 +287,11 @@ static int action_get_title_dropdown_item(
path, label, menu_type, s, len);
default:
{
/* Analog to Digital Type -submenus do not have labels */
if ((enum_idx > MENU_ENUM_LABEL_INPUT_PLAYER_ANALOG_DPAD_MODE) &&
(enum_idx < MENU_ENUM_LABEL_INPUT_PLAYER_ANALOG_DPAD_MODE_LAST))
enum_idx = MENU_ENUM_LABEL_VALUE_INPUT_ADC_TYPE;
const char *title = msg_hash_to_str(enum_idx);
if (s && !string_is_empty(title))
@ -474,7 +479,7 @@ static int action_get_title_dropdown_input_description_common(
sizeof(input_label));
/* Build title string */
snprintf(s, len, "%s #%u - %s",
snprintf(s, len, "%s %u - %s",
msg_hash_to_str(MENU_ENUM_LABEL_VALUE_PORT),
port + 1,
input_label);