#277 - Fixed a bug where expandable wasn't working correctly when use…

…d on a list that is very deeply nested
dbrizov · Oct 9, 2021 · 178959b · 178959b
1 parent ea17502
commit 178959b
Show file tree

Hide file tree

Showing 12 changed files with 49 additions and 39 deletions.
diff --git a/Assets/NaughtyAttributes/Samples/DemoScene/TestAssets/NaughtyScriptableObject.asset b/Assets/NaughtyAttributes/Samples/DemoScene/TestAssets/NaughtyScriptableObject.asset
@@ -12,7 +12,6 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 753bdb918c6038142acddbd7aae6958f, type: 3}
   m_Name: NaughtyScriptableObject
   m_EditorClassIdentifier: 
-  list:
+  listA:
+  - {fileID: 11400000, guid: 149474eb879a6a641b560ca17d48712f, type: 2}
   - {fileID: 11400000, guid: 149474eb879a6a641b560ca17d48712f, type: 2}
-  - {fileID: 11400000, guid: ca97c330d5c96794aa4df848d63f836b, type: 2}
-  - {fileID: 0}
diff --git a/...e/TestAssets/TestScriptableObject 0.asset → ...ne/TestAssets/TestScriptableObjectA.asset b/...e/TestAssets/TestScriptableObject 0.asset → ...ne/TestAssets/TestScriptableObjectA.asset
@@ -10,8 +10,8 @@ MonoBehaviour:
   m_Enabled: 1
   m_EditorHideFlags: 0
   m_Script: {fileID: 11500000, guid: 19472ac11eae27a4b804f354ca7d9c00, type: 3}
-  m_Name: TestScriptableObject 0
+  m_Name: TestScriptableObjectA
   m_EditorClassIdentifier: 
-  integer: 0
-  minMaxSlider: {x: 0, y: 0.5}
-  vectorValue: {x: 1, y: 0, z: 0}
+  listB:
+  - {fileID: 11400000, guid: 05371aa7630d3ef44ac0106af06cd73c, type: 2}
+  - {fileID: 11400000, guid: 05371aa7630d3ef44ac0106af06cd73c, type: 2}
diff --git a/...tAssets/TestScriptableObject 0.asset.meta → ...stAssets/TestScriptableObjectA.asset.meta b/...tAssets/TestScriptableObject 0.asset.meta → ...stAssets/TestScriptableObjectA.asset.meta
diff --git a/...e/TestAssets/TestScriptableObject 1.asset → ...ne/TestAssets/TestScriptableObjectB.asset b/...e/TestAssets/TestScriptableObject 1.asset → ...ne/TestAssets/TestScriptableObjectB.asset
@@ -9,8 +9,7 @@ MonoBehaviour:
   m_GameObject: {fileID: 0}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 19472ac11eae27a4b804f354ca7d9c00, type: 3}
-  m_Name: TestScriptableObject 1
+  m_Script: {fileID: 11500000, guid: c2b396aeebc9d984da298eee313896bc, type: 3}
+  m_Name: TestScriptableObjectB
   m_EditorClassIdentifier: 
-  minMaxSlider: {x: 0.5, y: 1}
-  vectorValue: {x: 0, y: 1, z: 0}
+  slider: {x: 3, y: 7}
diff --git a/...tAssets/TestScriptableObject 1.asset.meta → ...stAssets/TestScriptableObjectB.asset.meta b/...tAssets/TestScriptableObject 1.asset.meta → ...stAssets/TestScriptableObjectB.asset.meta
diff --git a/Assets/NaughtyAttributes/Scripts/Editor/PropertyDrawers/ExpandablePropertyDrawer.cs b/Assets/NaughtyAttributes/Scripts/Editor/PropertyDrawers/ExpandablePropertyDrawer.cs
@@ -71,6 +71,7 @@ protected override float GetPropertyHeight_Internal(SerializedProperty property,
 		protected override void OnGUI_Internal(Rect rect, SerializedProperty property, GUIContent label)
 		{
 			EditorGUI.BeginProperty(rect, label, property);
+			property.serializedObject.Update();
 
 			if (property.objectReferenceValue == null)
 			{
@@ -110,8 +111,6 @@ protected override void OnGUI_Internal(Rect rect, SerializedProperty property, G
 
 						EditorGUI.PropertyField(propertyRect, property, label, false);
 
-						property.serializedObject.ApplyModifiedProperties();
-
 						// Draw the child properties
 						if (property.isExpanded)
 						{
@@ -126,6 +125,7 @@ protected override void OnGUI_Internal(Rect rect, SerializedProperty property, G
 				}
 			}
 
+			property.serializedObject.ApplyModifiedProperties();
 			EditorGUI.EndProperty();
 		}
 
@@ -150,6 +150,7 @@ private void DrawChildProperties(Rect rect, SerializedProperty property)
 			using (new EditorGUI.IndentLevelScope())
 			{
 				SerializedObject serializedObject = new SerializedObject(scriptableObject);
+				serializedObject.Update();
 
 				using (var iterator = serializedObject.GetIterator())
 				{

diff --git a/Assets/NaughtyAttributes/Scripts/Test/_NaughtyScriptableObject.cs b/Assets/NaughtyAttributes/Scripts/Test/_NaughtyScriptableObject.cs
@@ -7,6 +7,6 @@ namespace NaughtyAttributes.Test
 	public class _NaughtyScriptableObject : ScriptableObject
 	{
 		[Expandable]
-		public List<_TestScriptableObject> list;
+		public List<_TestScriptableObjectA> listA;
 	}
 }
diff --git a/Assets/NaughtyAttributes/Scripts/Test/_TestScriptableObject.cs b/Assets/NaughtyAttributes/Scripts/Test/_TestScriptableObject.cs
diff --git a/Assets/NaughtyAttributes/Scripts/Test/_TestScriptableObjectA.cs b/Assets/NaughtyAttributes/Scripts/Test/_TestScriptableObjectA.cs
@@ -0,0 +1,12 @@
+using UnityEngine;
+using System.Collections.Generic;
+
+namespace NaughtyAttributes.Test
+{
+	//[CreateAssetMenu(fileName = "TestScriptableObjectA", menuName = "NaughtyAttributes/TestScriptableObjectA")]
+	public class _TestScriptableObjectA : ScriptableObject
+	{
+		[Expandable]
+		public List<_TestScriptableObjectB> listB;
+	}
+}
diff --git a/...cripts/Test/_TestScriptableObject.cs.meta → ...ripts/Test/_TestScriptableObjectA.cs.meta b/...cripts/Test/_TestScriptableObject.cs.meta → ...ripts/Test/_TestScriptableObjectA.cs.meta
diff --git a/Assets/NaughtyAttributes/Scripts/Test/_TestScriptableObjectB.cs b/Assets/NaughtyAttributes/Scripts/Test/_TestScriptableObjectB.cs
@@ -0,0 +1,12 @@
+using UnityEngine;
+using System.Collections.Generic;
+
+namespace NaughtyAttributes.Test
+{
+	//[CreateAssetMenu(fileName = "TestScriptableObjectB", menuName = "NaughtyAttributes/TestScriptableObjectB")]
+	public class _TestScriptableObjectB : ScriptableObject
+	{
+		[MinMaxSlider(0, 10)]
+		public Vector2Int slider;
+	}
+}
diff --git a/Assets/NaughtyAttributes/Scripts/Test/_TestScriptableObjectB.cs.meta b/Assets/NaughtyAttributes/Scripts/Test/_TestScriptableObjectB.cs.meta