WIP drawing improvements for the ReferencePicker

Author: arimger

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

@@ -10,6 +10,8 @@ namespace Toolbox.Editor.Drawers
 
     public class ReferencePickerAttributeDrawer : ToolboxSelfPropertyDrawer<ReferencePickerAttribute>
     {
+        private const float minTypeFieldWidth = 30.0f;
+
         private static readonly TypeConstraintContext sharedConstraint = new TypeConstraintReference(null);
         private static readonly TypeAppearanceContext sharedAppearance = new TypeAppearanceContext(sharedConstraint, TypeGrouping.None, true);
         private static readonly TypeField typeField = new TypeField(sharedConstraint, sharedAppearance);
@@ -20,11 +22,9 @@ private void UpdateContexts(ReferencePickerAttribute attribute)
             sharedAppearance.TypeGrouping = attribute.TypeGrouping;
         }
 
-        private void CreateTypeProperty(SerializedProperty property, Type parentType)
+        private void CreateTypeProperty(Rect position, SerializedProperty property, Type parentType)
         {
             TypeUtilities.TryGetTypeFromManagedReferenceFullTypeName(property.managedReferenceFullTypename, out var currentType);
-            var position = EditorGUILayout.GetControlRect(false, EditorGUIUtility.singleLineHeight);
-            position = EditorGUI.IndentedRect(position);
             typeField.OnGui(position, true, (type) =>
             {
                 try
@@ -83,17 +83,24 @@ protected override void OnGuiSafe(SerializedProperty property, GUIContent label,
         {
             using (var propertyScope = new PropertyScope(property, label))
             {
-                if (!propertyScope.IsVisible)
-                {
-                    return;
-                }
-
                 UpdateContexts(attribute);
                 var parentType = GetParentType(property, attribute);
-
                 EditorGUI.indentLevel++;
-                CreateTypeProperty(property, parentType);
-                ToolboxEditorGui.DrawPropertyChildren(property);
+
+                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);
+
+                CreateTypeProperty(position, property, parentType);
+                if (propertyScope.IsVisible)
+                {
+                    ToolboxEditorGui.DrawPropertyChildren(property);
+                }
+
                 EditorGUI.indentLevel--;
             }
         }

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

@@ -35,6 +35,9 @@ private void TryDrawLabel(Rect rect, GUIContent label)
         {
             if (property.hasChildren)
             {
+                var size = EditorStyles.label.CalcSize(label);
+                size.x = Mathf.Max(16, size.x);
+                rect.xMax = rect.xMin + size.x;       
                 property.isExpanded = EditorGUI.Foldout(rect, property.isExpanded, label, true);
             }
             else
@@ -52,4 +55,4 @@ public void Dispose()
 
         public bool IsVisible => property.isExpanded;
     }
-}
+}

Assets/Examples/Scripts/SampleBehaviour6.cs

@@ -13,6 +13,9 @@ 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 { }