Fix caching FieldInfo for nested [SerializeReference] collections; fix label rect calculations in the PropertyScope

Author: arimger

Assets/Editor Toolbox/Editor/Internal/PropertyScope.cs

@@ -36,17 +36,19 @@ private void TryDrawLabel(Rect rect, GUIContent label)
             InputRect = rect;
             var size = EditorStyles.label.CalcSize(label);
             rect.xMax = rect.xMin + size.x;
+            rect.xMax += EditorGuiUtility.IndentSize;
+            rect.xMax += EditorGuiUtility.SpacingSize;
             LabelRect = rect;
             if (property.hasVisibleChildren)
             {
                 var labelRect = LabelRect;
-                labelRect.xMax += EditorGuiUtility.FoldoutOffset;
+                labelRect.xMax += EditorGuiUtility.FoldoutSize;
                 LabelRect = labelRect;
                 property.isExpanded = EditorGUI.Foldout(labelRect, property.isExpanded, label, true);
             }
             else
             {
-                EditorGUI.LabelField(rect, label);
+                EditorGUI.LabelField(LabelRect, label);
             }
         }
 

Assets/Editor Toolbox/Editor/ToolboxPropertyHandler.cs

@@ -286,11 +286,11 @@ private void DrawProperty(SerializedProperty property, GUIContent label)
                     //draw target property using the associated type drawer
                     ToolboxDrawerModule.GetTargetTypeDrawer(type)?.OnGui(property, label);
                 }
+
+                return;
             }
-            else
-            {
-                OnGuiDefault(property, label);
-            }
+
+            OnGuiDefault(property, label);
         }
 
         private void BeginDecoratorDrawers(PropertyCondition conditionState = PropertyCondition.Valid)

Assets/Editor Toolbox/Editor/Utilities/EditorGuiUtility.cs

@@ -12,6 +12,8 @@ namespace Toolbox.Editor
     /// </summary>
     internal static class EditorGuiUtility
     {
+        private const float indentPerLevel = 15.0f;
+
         private static readonly Dictionary<string, Texture2D> loadedTextures = new Dictionary<string, Texture2D>();
 
 
@@ -99,6 +101,9 @@ public static Texture GetHelpIcon(MessageType messageType)
         }
 
 
-        public static float FoldoutOffset { get; internal set; } = 28.0f;
+        public static float FoldoutSize { get; internal set; } = 15.0f;
+        public static float SpacingSize => EditorGUIUtility.standardVerticalSpacing;
+        public static float HeightSize => EditorGUIUtility.singleLineHeight;
+        public static float IndentSize => EditorGUI.indentLevel * indentPerLevel;
     }
 }

Assets/Editor Toolbox/Editor/Utilities/PropertyUtility.cs

@@ -10,6 +10,11 @@ namespace Toolbox.Editor
 {
     public static partial class PropertyUtility
     {
+        //TODO: temp
+        private static readonly MethodInfo getGetFieldInfoFromPropertyMethod =
+            ReflectionUtility.GetEditorMethod("UnityEditor.ScriptAttributeUtility", "GetFieldInfoFromProperty",
+                BindingFlags.NonPublic | BindingFlags.Static);
+
         /// <summary>
         /// Indicates if the property has all changes applied and can be safely used for reflection-based features.
         /// </summary>
@@ -257,7 +262,13 @@ public static FieldInfo GetFieldInfo(this SerializedProperty property)
 
         public static FieldInfo GetFieldInfo(this SerializedProperty property, out Type propertyType)
         {
-            return GetFieldInfoFromProperty(property, out propertyType);
+            var parameters = new object[] { property, null };
+            var result = getGetFieldInfoFromPropertyMethod.Invoke(null, parameters) as FieldInfo;
+            propertyType = parameters[1] as Type;
+            return result;
+
+            //NOTE: ...
+            //return GetFieldInfoFromProperty(property, out propertyType);
         }
 
         public static FieldInfo GetFieldInfo(this SerializedProperty property, out Type propertyType, Object target)
@@ -277,8 +288,12 @@ public static FieldInfo GetFieldInfoFromProperty(SerializedProperty property, ou
             return GetFieldInfoFromProperty(property, out type, classType);
         }
 
+        //NOTE: ...
+        //TODO: make it internal
         public static FieldInfo GetFieldInfoFromProperty(SerializedProperty property, out Type type, Type host)
         {
+            const BindingFlags fieldFlags = BindingFlags.Instance | BindingFlags.Public | BindingFlags.NonPublic;
+
             FieldInfo field = null;
             type = host;
 
@@ -297,7 +312,6 @@ public static FieldInfo GetFieldInfoFromProperty(SerializedProperty property, ou
                     continue;
                 }
 
-                const BindingFlags fieldFlags = BindingFlags.Instance | BindingFlags.Public | BindingFlags.NonPublic;
                 FieldInfo foundField = null;
                 for (var currentType = type; foundField == null && currentType != null; currentType = currentType.BaseType)
                 {