From c89f1feb446a990a6e5d0f8dee592d0bd0408618 Mon Sep 17 00:00:00 2001 From: sonninnos Date: Sat, 6 Feb 2021 22:41:02 +0200 Subject: [PATCH] Reorder Mouse Index next to Device Index --- menu/drivers/ozone/ozone_texture.c | 12 ++++---- menu/drivers/xmb.c | 12 ++++---- menu/menu_setting.c | 44 +++++++++++++++--------------- 3 files changed, 34 insertions(+), 34 deletions(-) diff --git a/menu/drivers/ozone/ozone_texture.c b/menu/drivers/ozone/ozone_texture.c index 3c8a0e4ad3..f9512cbc51 100644 --- a/menu/drivers/ozone/ozone_texture.c +++ b/menu/drivers/ozone/ozone_texture.c @@ -484,13 +484,13 @@ uintptr_t ozone_entries_icon_get_texture(ozone_handle_t *ozone, if (type == input_id + 2) return ozone->icons_textures[OZONE_ENTRIES_ICONS_TEXTURE_INPUT_SETTINGS]; if (type == input_id + 3) - return ozone->icons_textures[OZONE_ENTRIES_ICONS_TEXTURE_INPUT_BIND_ALL]; - if (type == input_id + 4) - return ozone->icons_textures[OZONE_ENTRIES_ICONS_TEXTURE_RELOAD]; - if (type == input_id + 5) - return ozone->icons_textures[OZONE_ENTRIES_ICONS_TEXTURE_SAVING]; - if (type == input_id + 6) return ozone->icons_textures[OZONE_ENTRIES_ICONS_TEXTURE_INPUT_MOUSE]; + if (type == input_id + 4) + return ozone->icons_textures[OZONE_ENTRIES_ICONS_TEXTURE_INPUT_BIND_ALL]; + if (type == input_id + 5) + return ozone->icons_textures[OZONE_ENTRIES_ICONS_TEXTURE_RELOAD]; + if (type == input_id + 6) + return ozone->icons_textures[OZONE_ENTRIES_ICONS_TEXTURE_SAVING]; if ((type > (input_id + 30)) && (type < (input_id + 42))) return ozone->icons_textures[OZONE_ENTRIES_ICONS_TEXTURE_INPUT_LGUN]; if (type == input_id + 42) diff --git a/menu/drivers/xmb.c b/menu/drivers/xmb.c index 2048952c50..02b9b61388 100644 --- a/menu/drivers/xmb.c +++ b/menu/drivers/xmb.c @@ -2918,13 +2918,13 @@ static uintptr_t xmb_icon_get_id(xmb_handle_t *xmb, if ( type == input_id + 2) return xmb->textures.list[XMB_TEXTURE_INPUT_SETTINGS]; if ( type == input_id + 3) - return xmb->textures.list[XMB_TEXTURE_INPUT_BIND_ALL]; - if ( type == input_id + 4) - return xmb->textures.list[XMB_TEXTURE_RELOAD]; - if ( type == input_id + 5) - return xmb->textures.list[XMB_TEXTURE_SAVING]; - if ( type == input_id + 6) return xmb->textures.list[XMB_TEXTURE_INPUT_MOUSE]; + if ( type == input_id + 4) + return xmb->textures.list[XMB_TEXTURE_INPUT_BIND_ALL]; + if ( type == input_id + 5) + return xmb->textures.list[XMB_TEXTURE_RELOAD]; + if ( type == input_id + 6) + return xmb->textures.list[XMB_TEXTURE_SAVING]; if ((type > (input_id + 30)) && (type < (input_id + 42))) return xmb->textures.list[XMB_TEXTURE_INPUT_LGUN]; if ( type == input_id + 42) diff --git a/menu/menu_setting.c b/menu/menu_setting.c index a6f1891204..df54b78b7d 100644 --- a/menu/menu_setting.c +++ b/menu/menu_setting.c @@ -8000,6 +8000,28 @@ static bool setting_append_list_input_player_options( MENU_SETTINGS_LIST_CURRENT_ADD_ENUM_IDX_PTR(list, list_info, (enum msg_hash_enums)(MENU_ENUM_LABEL_INPUT_DEVICE_INDEX + user)); + CONFIG_UINT_ALT( + list, list_info, + &settings->uints.input_mouse_index[user], + mouse_index[user], + label_mouse_index[user], + 0, + &group_info, + &subgroup_info, + parent_group, + general_write_handler, + general_read_handler); + (*list)[list_info->index - 1].index = user + 1; + (*list)[list_info->index - 1].index_offset = user; + (*list)[list_info->index - 1].action_start = &setting_action_start_mouse_index; + (*list)[list_info->index - 1].action_left = &setting_action_left_mouse_index; + (*list)[list_info->index - 1].action_right = &setting_action_right_mouse_index; + (*list)[list_info->index - 1].action_select = &setting_action_right_mouse_index; + (*list)[list_info->index - 1].action_ok = &setting_action_ok_uint; + menu_settings_list_current_add_range(list, list_info, 0, MAX_USERS - 1, 1.0, true, true); + MENU_SETTINGS_LIST_CURRENT_ADD_ENUM_IDX_PTR(list, list_info, + (enum msg_hash_enums)(MENU_ENUM_LABEL_INPUT_MOUSE_INDEX + user)); + CONFIG_ACTION_ALT( list, list_info, key_bind_all[user], @@ -8037,28 +8059,6 @@ static bool setting_append_list_input_player_options( (*list)[list_info->index - 1].action_ok = &setting_action_ok_bind_all_save_autoconfig; (*list)[list_info->index - 1].action_cancel = NULL; #endif - - CONFIG_UINT_ALT( - list, list_info, - &settings->uints.input_mouse_index[user], - mouse_index[user], - label_mouse_index[user], - 0, - &group_info, - &subgroup_info, - parent_group, - general_write_handler, - general_read_handler); - (*list)[list_info->index - 1].index = user + 1; - (*list)[list_info->index - 1].index_offset = user; - (*list)[list_info->index - 1].action_start = &setting_action_start_mouse_index; - (*list)[list_info->index - 1].action_left = &setting_action_left_mouse_index; - (*list)[list_info->index - 1].action_right = &setting_action_right_mouse_index; - (*list)[list_info->index - 1].action_select = &setting_action_right_mouse_index; - (*list)[list_info->index - 1].action_ok = &setting_action_ok_uint; - menu_settings_list_current_add_range(list, list_info, 0, MAX_USERS - 1, 1.0, true, true); - MENU_SETTINGS_LIST_CURRENT_ADD_ENUM_IDX_PTR(list, list_info, - (enum msg_hash_enums)(MENU_ENUM_LABEL_INPUT_MOUSE_INDEX + user)); } for (i = 0; i < RARCH_BIND_LIST_END; i ++)