CHANGE: Removed aliased values in Gamepad enum. (ISXB-543) #1983
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,72 @@ | ||
| #if UNITY_EDITOR | ||
|
||
|
|
||
| using System; | ||
| using System.Collections.Generic; | ||
| using System.Linq; | ||
| using System.Xml.Linq; | ||
| using UnityEditor; | ||
| using UnityEngine.UIElements; | ||
|
|
||
| namespace UnityEngine.InputSystem.Editor | ||
| { | ||
| /// <summary> | ||
| /// Abstract base class for a generic property drawer for aliased enums. | ||
| /// </summary> | ||
| internal abstract class AliasedEnumPropertyDrawer<T> : PropertyDrawer where T : Enum | ||
| { | ||
| private string[] m_EnumDisplayNames; | ||
|
|
||
| public override VisualElement CreatePropertyGUI(SerializedProperty property) | ||
| { | ||
| ProcessDisplayNamesForAliasedEnums(); | ||
| return base.CreatePropertyGUI(property); | ||
| } | ||
|
|
||
| protected abstract bool TryGetNonAliasedNames(string enumName, string displayName, out string outputName); | ||
|
|
||
| private void ProcessDisplayNamesForAliasedEnums() | ||
| { | ||
| var enumNamesAndValues = new Dictionary<string, int>(); | ||
|
||
| var enumDisplayNames = Enum.GetNames(typeof(T)); | ||
| var enumValues = Enum.GetValues(typeof(T)).Cast<T>().ToArray(); | ||
| var enumStringValues = enumValues.Select(v => v.ToString()).ToArray(); | ||
| for (var i = 0; i < enumDisplayNames.Length; ++i) | ||
| { | ||
| var enumName = enumDisplayNames[i]; | ||
|
|
||
| if (TryGetNonAliasedNames(enumStringValues[i], enumDisplayNames[i], out string aliasedName)) | ||
| { | ||
| if (!string.IsNullOrEmpty(aliasedName)) | ||
| { | ||
| enumName = $"{enumName} ({aliasedName})"; | ||
| } | ||
| else | ||
| { | ||
| continue; | ||
| } | ||
| } | ||
|
|
||
| enumNamesAndValues.Add(enumName, (int)enumValues.GetValue(i)); | ||
| } | ||
|
|
||
| var sortedEntries = enumNamesAndValues | ||
| .OrderBy(x => x.Value) | ||
| .ThenBy(x => x.Key.Contains("(")); | ||
|
|
||
| m_EnumDisplayNames = sortedEntries.Select(x => x.Key).ToArray(); | ||
| } | ||
|
|
||
| public override void OnGUI(Rect position, SerializedProperty property, GUIContent label) | ||
| { | ||
| EditorGUI.BeginProperty(position, label, property); | ||
|
|
||
| if (property.propertyType == SerializedPropertyType.Enum) | ||
| { | ||
| property.enumValueIndex = EditorGUI.Popup(position, label.text, property.enumValueIndex, m_EnumDisplayNames); | ||
| } | ||
|
|
||
| EditorGUI.EndProperty(); | ||
| } | ||
| } | ||
| } | ||
| #endif // UNITY_EDITOR | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,34 @@ | ||
| #if UNITY_EDITOR | ||
|
|
||
| using UnityEditor; | ||
| using UnityEngine.InputSystem.LowLevel; | ||
|
|
||
| namespace UnityEngine.InputSystem.Editor | ||
| { | ||
| /// <summary> | ||
| /// Property drawer for <see cref = "GamepadButton" /> | ||
| /// </summary > | ||
| [CustomPropertyDrawer(typeof(GamepadButton))] | ||
| internal class GpadButtonPropertyDrawer : AliasedEnumPropertyDrawer<GamepadButton> | ||
| { | ||
| protected override bool TryGetNonAliasedNames(string enumName, string displayName, out string outputName) | ||
| { | ||
| outputName = ""; | ||
| switch (displayName) | ||
| { | ||
| case nameof(GamepadButton.Y): | ||
| case nameof(GamepadButton.Triangle): | ||
| case nameof(GamepadButton.A): | ||
| case nameof(GamepadButton.Cross): | ||
| case nameof(GamepadButton.B): | ||
| case nameof(GamepadButton.Circle): | ||
| case nameof(GamepadButton.X): | ||
| case nameof(GamepadButton.Square): | ||
| return true; | ||
| default: | ||
| return false; | ||
| } | ||
| } | ||
| } | ||
| } | ||
| #endif // UNITY_EDITOR |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The fix shouldn't have any impact on existing tests?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Hence I wouldn't expect any changes to any tests.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I believe this is due to my first pass where I removed the aliased values. Will revert