Hide foldout for properties without children

Author: arimger

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

@@ -10,7 +10,6 @@ namespace Toolbox.Editor.Drawers
 
     public class ReferencePickerAttributeDrawer : ToolboxSelfPropertyDrawer<ReferencePickerAttribute>
     {
-        private const float neededLabelWidth = 100.0f;
         private const float labelWidthOffset = -80.0f;
 
         private static readonly TypeConstraintContext sharedConstraint = new TypeConstraintReference(null);
@@ -89,12 +88,9 @@ private Rect PrepareTypePropertyPosition(in Rect labelPosition, in Rect inputPos
             if (isPropertyExpanded)
             {
                 //property is expanded and we have place to move it to the next row
-                if (labelWidth < neededLabelWidth)
-                {
-                    position = EditorGUILayout.GetControlRect(false, EditorGUIUtility.singleLineHeight);
-                    position = EditorGUI.IndentedRect(position);
-                    return position;
-                }
+                position = EditorGUILayout.GetControlRect(false, EditorGUIUtility.singleLineHeight);
+                position = EditorGUI.IndentedRect(position);
+                return position;
             }
 
             //adjust position to already rendered label

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

@@ -33,15 +33,16 @@ 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);
+            rect.xMax = rect.xMin + size.x;
+            LabelRect = rect;
+            if (property.hasVisibleChildren)
             {
-                var size = EditorStyles.label.CalcSize(label);
-                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);
+                var labelRect = LabelRect;
+                labelRect.xMax += EditorGuiUtility.FoldoutOffset;
+                LabelRect = labelRect;
+                property.isExpanded = EditorGUI.Foldout(labelRect, property.isExpanded, label, true);
             }
             else
             {

Assets/Examples/Scenes/SampleScene.unity

@@ -583,6 +583,7 @@ MonoBehaviour:
     id: 1
   var3:
     id: 2
+  vars: []
   references:
     version: 1
     00000000: