Minor refactor changes

Author: arimger

Assets/Editor Toolbox/Editor/Drawers/Toolbox/PropertySelf/ReferencePickerAttributeDrawer.cs

@@ -10,7 +10,8 @@ namespace Toolbox.Editor.Drawers
 
     public class ReferencePickerAttributeDrawer : ToolboxSelfPropertyDrawer<ReferencePickerAttribute>
     {
-        private const float minTypeFieldWidth = 30.0f;
+        private const float minLabelWidth = 100.0f;
+        private const float labelWidthOffset = -80.0f;
 
         private static readonly TypeConstraintContext sharedConstraint = new TypeConstraintReference(null);
         private static readonly TypeAppearanceContext sharedAppearance = new TypeAppearanceContext(sharedConstraint, TypeGrouping.None, true);
@@ -22,6 +23,24 @@ private void UpdateContexts(ReferencePickerAttribute attribute)
             sharedAppearance.TypeGrouping = attribute.TypeGrouping;
         }
 
+        private Type GetParentType(SerializedProperty property, ReferencePickerAttribute attribute)
+        {
+            property.GetFieldInfo(out Type propertyType);
+            var candidateType = attribute.ParentType;
+            if (candidateType != null)
+            {
+                if (propertyType.IsAssignableFrom(candidateType))
+                {
+                    return candidateType;
+                }
+
+                ToolboxEditorLog.AttributeUsageWarning(attribute, property,
+                    $"Provided {nameof(attribute.ParentType)} ({candidateType}) cannot be used because it's not assignable from: '{propertyType}'");
+            }
+
+            return propertyType;
+        }
+
         private void CreateTypeProperty(Rect position, SerializedProperty property, Type parentType)
         {
             TypeUtilities.TryGetTypeFromManagedReferenceFullTypeName(property.managedReferenceFullTypename, out var currentType);
@@ -61,42 +80,43 @@ private void UpdateTypeProperty(SerializedProperty property, Type referenceType)
             property.serializedObject.ApplyModifiedProperties();
         }
 
-        private Type GetParentType(SerializedProperty property, ReferencePickerAttribute attribute)
+        private Rect CreateTypePropertyPosition(in Rect labelPosition, in Rect inputPosition, bool isPropertyExpanded)
         {
-            property.GetFieldInfo(out Type propertyType);
-            var candidateType = attribute.ParentType;
-            if (candidateType != null)
+            var position = new Rect(inputPosition);
+            var baseLabelWidth = EditorGUIUtility.labelWidth + labelWidthOffset;
+            var realLabelWidth = labelPosition.width;
+            var labelWidth = Mathf.Max(baseLabelWidth, realLabelWidth);
+            if (isPropertyExpanded)
             {
-                if (propertyType.IsAssignableFrom(candidateType))
+                //NOTE: property is expanded and we have place to move it to the next row
+                if (labelWidth < minLabelWidth)
                 {
-                    return candidateType;
+                    position = EditorGUILayout.GetControlRect(false, EditorGUIUtility.singleLineHeight);
+                    position = EditorGUI.IndentedRect(position);
+                    return position;
                 }
-
-                ToolboxEditorLog.AttributeUsageWarning(attribute, property,
-                    $"Provided {nameof(attribute.ParentType)} ({candidateType}) cannot be used because it's not assignable from: '{propertyType}'");
             }
 
-            return propertyType;
+            position.xMin += labelWidth;
+            return position;
         }
 
+
         protected override void OnGuiSafe(SerializedProperty property, GUIContent label, ReferencePickerAttribute attribute)
         {
             using (var propertyScope = new PropertyScope(property, label))
             {
                 UpdateContexts(attribute);
-                var parentType = GetParentType(property, attribute);
-                EditorGUI.indentLevel++;
 
-                var position = GUILayoutUtility.GetLastRect();
-                position.xMax = position.xMin + EditorGUIUtility.currentViewWidth;
-                var labelSize = EditorStyles.label.CalcSize(label);
-                var x = Mathf.Max(EditorGUIUtility.labelWidth, labelSize.x);
-                position.xMin = position.xMin + x;
-                //position = EditorGUILayout.GetControlRect(false, EditorGUIUtility.singleLineHeight);
-                //position = EditorGUI.IndentedRect(position);
+                var isPropertyExpanded = propertyScope.IsVisible;
+                EditorGUI.indentLevel++;
+                var labelRect = propertyScope.LabelRect;
+                var inputRect = propertyScope.InputRect;
+                var position = CreateTypePropertyPosition(in labelRect, in inputRect, isPropertyExpanded);
 
+                var parentType = GetParentType(property, attribute);
                 CreateTypeProperty(position, property, parentType);
-                if (propertyScope.IsVisible)
+                if (isPropertyExpanded)
                 {
                     ToolboxEditorGui.DrawPropertyChildren(property);
                 }

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

@@ -17,9 +17,9 @@ internal class PropertyScope : IDisposable
         public PropertyScope(SerializedProperty property, GUIContent label)
         {
             this.property = property;
-            ToolboxEditorGui.BeginProperty(property, ref label, out var labelRect);
-            HandleEvents(labelRect);
-            TryDrawLabel(labelRect, label);
+            ToolboxEditorGui.BeginProperty(property, ref label, out var rect);
+            HandleEvents(rect);
+            TryDrawLabel(rect, label);
         }
 
 
@@ -33,11 +33,14 @@ private void HandleEvents(Rect rect)
 
         private void TryDrawLabel(Rect rect, GUIContent label)
         {
+            LabelRect = rect;
+            InputRect = rect;
             if (property.hasChildren)
             {
                 var size = EditorStyles.label.CalcSize(label);
-                size.x = Mathf.Max(16, size.x);
-                rect.xMax = rect.xMin + size.x;       
+                size.x = Mathf.Max(EditorGuiUtility.FoldoutOffset, size.x);
+                rect.xMax = rect.xMin + size.x;
+                LabelRect = rect;
                 property.isExpanded = EditorGUI.Foldout(rect, property.isExpanded, label, true);
             }
             else
@@ -54,5 +57,7 @@ public void Dispose()
 
 
         public bool IsVisible => property.isExpanded;
+        public Rect LabelRect { get; private set; }
+        public Rect InputRect { get; private set; }
     }
 }

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

@@ -97,5 +97,8 @@ public static Texture GetHelpIcon(MessageType messageType)
 
             return null;
         }
+
+
+        public static float FoldoutOffset { get; internal set; } = 28.0f;
     }
 }

Assets/Examples/Scripts/SampleBehaviour6.cs

@@ -13,12 +13,12 @@ public class SampleBehaviour6 : MonoBehaviour
     public ClassWithInterfaceBase var2;
     [SerializeReference, ReferencePicker(ParentType = typeof(ClassWithInterface2))]
     public ClassWithInterfaceBase var3;
-    public int a;
     [SerializeField, SerializeReference, ReferencePicker]
     public Interface1[] vars;
 #endif
 
-    public interface Interface1 { }
+    public interface Interface1
+    { }
 
     [Serializable]
     public struct Struct : Interface1
@@ -27,7 +27,8 @@ public struct Struct : Interface1
         public bool var2;
     }
 
-    public abstract class ClassWithInterfaceBase : Interface1 { }
+    public abstract class ClassWithInterfaceBase : Interface1
+    { }
 
     [Serializable]
     public class ClassWithInterface1 : ClassWithInterfaceBase