#200 - fixed a nesting bug where some elements were overlapping

dbrizov · Jan 11, 2021 · 0183cca · 0183cca
1 parent aa20fa3
commit 0183cca
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/Assets/NaughtyAttributes/Scripts/Editor/NaughtyInspector.cs b/Assets/NaughtyAttributes/Scripts/Editor/NaughtyInspector.cs
@@ -84,7 +84,7 @@ protected void DrawSerializedProperties()
 				}
 				else
 				{
-					NaughtyEditorGUI.PropertyField_Layout(property, true);
+					NaughtyEditorGUI.PropertyField_Layout(property, includeChildren: true);
 				}
 			}
 
@@ -100,7 +100,7 @@ protected void DrawSerializedProperties()
 				NaughtyEditorGUI.BeginBoxGroup_Layout(group.Key);
 				foreach (var property in visibleProperties)
 				{
-					NaughtyEditorGUI.PropertyField_Layout(property, true);
+					NaughtyEditorGUI.PropertyField_Layout(property, includeChildren: true);
 				}
 
 				NaughtyEditorGUI.EndBoxGroup_Layout();

diff --git a/Assets/NaughtyAttributes/Scripts/Editor/PropertyDrawers/PropertyDrawerBase.cs b/Assets/NaughtyAttributes/Scripts/Editor/PropertyDrawers/PropertyDrawerBase.cs
@@ -52,7 +52,7 @@ sealed override public float GetPropertyHeight(SerializedProperty property, GUIC
 
 		protected virtual float GetPropertyHeight_Internal(SerializedProperty property, GUIContent label)
 		{
-			return base.GetPropertyHeight(property, label);
+			return EditorGUI.GetPropertyHeight(property, includeChildren: true);
 		}
 
 		protected float GetPropertyHeight(SerializedProperty property)
@@ -63,7 +63,7 @@ protected float GetPropertyHeight(SerializedProperty property)
 				return specialCaseAttribute.GetDrawer().GetPropertyHeight(property);
 			}
 
-			return EditorGUI.GetPropertyHeight(property, true);
+			return EditorGUI.GetPropertyHeight(property, includeChildren: true);
 		}
 
 		public virtual float GetHelpBoxHeight()