Merge pull request #181 from brunomikoski/feature/omit-labels-in-arrays-and-lists

Feature/omit labels in arrays and lists

Author: brunomikoski

Scripts/Editor/Extensions/SerializedPropertyExtensions.cs

@@ -3,6 +3,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Reflection;
+using System.Text.RegularExpressions;
 using UnityEditor;
 using UnityEngine;
 using Object = UnityEngine.Object;
@@ -301,5 +302,49 @@ static T DescendHierarchy<T>(object targetObject, List<string> splitName, List<i
 
             return DescendHierarchy<T>(newObj, splitName, splitCounts, depth + 1);
         }
+        
+        /// <summary>
+        /// From: https://gist.github.com/monry/9de7009689cbc5050c652bcaaaa11daa
+        /// </summary>
+        public static SerializedProperty GetParent(this SerializedProperty serializedProperty)
+        {
+            string[] propertyPaths = serializedProperty.propertyPath.Split('.');
+            if (propertyPaths.Length <= 1)
+                return default;
+
+            SerializedProperty parentSerializedProperty =
+                serializedProperty.serializedObject.FindProperty(propertyPaths.First());
+            for (int index = 1; index < propertyPaths.Length - 1; index++)
+            {
+                if (propertyPaths[index] == "Array")
+                {
+                    // Reached the end
+                    if (index + 1 == propertyPaths.Length - 1)
+                        break;
+                    
+                    if (propertyPaths.Length > index + 1 && Regex.IsMatch(propertyPaths[index + 1], "^data\\[\\d+\\]$"))
+                    {
+                        Match match = Regex.Match(propertyPaths[index + 1], "^data\\[(\\d+)\\]$");
+                        int arrayIndex = int.Parse(match.Groups[1].Value);
+                        parentSerializedProperty = parentSerializedProperty.GetArrayElementAtIndex(arrayIndex);
+                        index++;
+                    }
+                    
+                    continue;
+                }
+
+                parentSerializedProperty = parentSerializedProperty.FindPropertyRelative(propertyPaths[index]);
+            }
+
+            return parentSerializedProperty;
+        }
+        
+        public static bool IsInArray(this SerializedProperty serializedProperty)
+        {
+            SerializedProperty parent = serializedProperty.GetParent();
+            if (parent == null)
+                return false;
+            return parent.isArray;
+        }
     }
 }

Scripts/Editor/PropertyDrawers/CollectionItemPropertyDrawer.cs

@@ -70,6 +70,11 @@ public override float GetPropertyHeight(SerializedProperty property, GUIContent
         public override void OnGUI(Rect position, SerializedProperty property, GUIContent label)
         {
             Initialize(property);
+            
+            // If this property is inside of a list, don't show a label. It would just say something like "Element 0"
+            // anyway which is not useful. Might as well have a bit more room to see what the value says.
+            if (property.IsInArray())
+                label = GUIContent.none;
 
             if (OptionsAttribute.DrawType == DrawType.AsReference)
             {
@@ -342,4 +347,4 @@ public void OverrideFieldInfo(FieldInfo targetFieldInfo)
             overrideFieldInfo = targetFieldInfo;
         }
     }
-}
+}