Add EnumArray.EnumNameWithAlias

Author: lawwong

Assets/HTC.UnityPlugin/Utility/Container/EnumArray.cs

@@ -168,6 +168,7 @@ public abstract class EnumArrayBase
         public abstract int Length { get; }
         public abstract int Capacity { get; }
         public abstract string EnumName(int enumInt);
+        public abstract string EnumNameWithAlias(int enumInt);
         public abstract bool IsValidIndex(int enumInt);
         public abstract void Clear();
         public abstract void FillCapacityToLength();
@@ -320,6 +321,7 @@ public bool MoveNext()
 
         private static readonly TEnum[] enums;
         private static readonly string[] enumNames;
+        private static readonly string[] enumNameWithAliases;
         private static Func<TEnum, int> funcE2I;
         public static readonly int StaticMinInt;
         public static readonly TEnum StaticMin;
@@ -434,15 +436,40 @@ static EnumArrayBase()
             // create an int array with invalid enum values
             enums = new TEnum[StaticLength];
             enumNames = new string[StaticLength];
+            enumNameWithAliases = new string[StaticLength];
             for (int fi = 0, imax = fields.Length; fi < imax; ++fi)
             {
                 if (fieldNames[fi] == null) { continue; }
 
                 var i = fieldValues[fi] - StaticMinInt;
-                if (enumNames[i] != null) { continue; }
+                if (enumNames[i] == null)
+                {
+                    enums[i] = fieldEnums[fi];
+                    enumNames[i] = fieldNames[fi];
+                }
+                else if (enumNameWithAliases[i] == null)
+                {
+                    enumNameWithAliases[i] = fieldNames[fi];
+                }
+                else
+                {
+                    enumNameWithAliases[i] += ", " + fieldNames[fi];
+                }
+            }
 
-                enums[i] = fieldEnums[fi];
-                enumNames[i] = fieldNames[fi];
+            for (int i = 0, imax = StaticLength; i < imax; ++i)
+            {
+                if (enumNames[i] != null)
+                {
+                    if (enumNameWithAliases[i] != null)
+                    {
+                        enumNameWithAliases[i] = enumNames[i] + " (" + enumNameWithAliases[i] + ")";
+                    }
+                    else
+                    {
+                        enumNameWithAliases[i] = enumNames[i];
+                    }
+                }
             }
         }
 
@@ -453,6 +480,11 @@ public override string EnumName(int enumInt)
             return StaticEnumName(enumInt);
         }
 
+        public override string EnumNameWithAlias(int enumInt)
+        {
+            return StaticEnumNameWithAlias(enumInt);
+        }
+
         public static string StaticEnumName(TEnum e)
         {
             return StaticEnumName(E2I(e));
@@ -463,6 +495,11 @@ public static string StaticEnumName(int enumInt)
             return enumNames[enumInt - StaticMinInt];
         }
 
+        public static string StaticEnumNameWithAlias(int enumInt)
+        {
+            return enumNameWithAliases[enumInt - StaticMinInt];
+        }
+
         public override bool IsValidIndex(int enumInt)
         {
             return StaticIsValidIndex(enumInt);

Assets/HTC.UnityPlugin/ViveInputUtility/Scripts/ControllerTooltip/Editor/TooltipRenderDataAssetBaseEditor.cs

@@ -107,7 +107,7 @@ private void ShowAddTriggerMenu()
             {
                 var button = ev.Key;
                 var visible = ev.Value;
-                var name = visibleInList.EnumName((int)button);
+                var name = visibleInList.EnumNameWithAlias((int)button);
                 if (visible)
                 {
                     menu.AddDisabledItem(new GUIContent(name));

Assets/HTC.UnityPlugin/ViveInputUtility/Scripts/ControllerTooltip/Editor/TooltipRigAssetEditor.cs

@@ -125,26 +125,18 @@ public override void OnInspectorGUI()
         private void ShowAddTriggerMenu()
         {
             var menu = new GenericMenu();
-            var displayedNames = new List<GUIContent>(btnEnumInfo.displayedLength);
-            var displayedValues = new List<int>(btnEnumInfo.displayedLength);
-            for (int i = 0, imax = btnEnumInfo.displayedLength; i < imax; ++i)
+            foreach (var ev in visibleInList.EnumValues)
             {
-                var v = btnEnumInfo.displayedValues[i];
-                displayedNames.Add(new GUIContent(btnEnumInfo.displayedNames[i]));
-                displayedValues.Add(v);
-            }
-            for (int i = 0, imax = btnEnumInfo.displayedLength; i < imax; ++i)
-            {
-                var value = btnEnumInfo.displayedValues[i];
-                //if (value == (int)ControllerButton.None) { continue; }
-                var name = btnEnumInfo.displayedNames[i];
-                if (visibleInList[value])
+                var button = ev.Key;
+                var visible = ev.Value;
+                var name = visibleInList.EnumNameWithAlias((int)button);
+                if (visible)
                 {
                     menu.AddDisabledItem(new GUIContent(name));
                 }
                 else
                 {
-                    menu.AddItem(new GUIContent(name), false, OnAddNewSelected, value);
+                    menu.AddItem(new GUIContent(name), false, OnAddNewSelected, (int)button);
                 }
             }
             menu.ShowAsContext();