Clear InLinedEditor after folding properties; improve displaying mixed values while using the ReferencePickerAttribute; improve footer position in the ReorderableList class

Author: arimger

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

@@ -46,7 +46,6 @@ static InLineEditorAttributeDrawer()
 
         private static readonly PropertyDataStorage<Editor, InLineEditorAttribute> storage;
 
-
         private Editor GetTargetsEditor(SerializedProperty property, InLineEditorAttribute attribute)
         {
             var editor = storage.ReturnItem(property, attribute);
@@ -108,7 +107,6 @@ private void DrawEditor(Editor editor, bool disableEditor, bool drawPreview, boo
             }
         }
 
-
         /// <summary>
         /// Handles the property drawing process and tries to create a inlined version of the <see cref="Editor"/>.
         /// </summary>
@@ -151,15 +149,17 @@ protected override void OnGuiSafe(SerializedProperty property, GUIContent label,
                     DrawEditor(editor, attribute);
                 }
             }
+            else
+            {
+                storage.ClearItem(property);
+            }
         }
 
-
         public override bool IsPropertyValid(SerializedProperty property)
         {
             return property.propertyType == SerializedPropertyType.ObjectReference;
         }
 
-
         private static class Style
         {
             internal static readonly GUIStyle backgroundStyle;

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

@@ -41,9 +41,38 @@ private Type GetParentType(ReferencePickerAttribute attribute, SerializedPropert
             return fieldType;
         }
 
+        private static Type GetCurrentManagedReferenceType(SerializedProperty property, out bool hasMixedValues)
+        {
+            var fullTypeName = property.managedReferenceFullTypename;
+            hasMixedValues = false;
+            TypeUtility.TryGetTypeFromManagedReferenceFullTypeName(fullTypeName, out var targetType);
+
+            var currentSerializedObject = property.serializedObject;
+            if (currentSerializedObject.isEditingMultipleObjects)
+            {
+                var targets = currentSerializedObject.targetObjects;
+                foreach (var target in targets)
+                {
+                    using (var tempSerializedObject = new SerializedObject(target))
+                    {
+                        var tempProperty = tempSerializedObject.FindProperty(property.propertyPath);
+                        if (tempProperty.managedReferenceFullTypename != fullTypeName)
+                        {
+                            hasMixedValues = true;
+                            break;
+                        }
+                    }
+                }
+            }
+
+            return targetType;
+        }
+
         private void CreateTypeProperty(SerializedProperty property, Type parentType, ReferencePickerAttribute attribute, Rect position)
         {
-            TypeUtility.TryGetTypeFromManagedReferenceFullTypeName(property.managedReferenceFullTypename, out var currentType);
+            var currentType = GetCurrentManagedReferenceType(property, out var hasMixedValues);
+            var hadMixedValues = EditorGUI.showMixedValue;
+            EditorGUI.showMixedValue = hasMixedValues;
             typeField.OnGui(position, attribute.AddTextSearchField, (type) =>
             {
                 try
@@ -70,6 +99,7 @@ private void CreateTypeProperty(SerializedProperty property, Type parentType, Re
                     ToolboxEditorLog.LogWarning("Invalid attempt to update disposed property.");
                 }
             }, currentType, parentType);
+            EditorGUI.showMixedValue = false;
         }
 
         private void UpdateTypeProperty(SerializedProperty property, Type targetType, ReferencePickerAttribute attribute)

Assets/Editor Toolbox/Editor/Internal/ReorderableListBase.cs

@@ -334,6 +334,8 @@ protected virtual bool DoListFooter(Rect footerRect)
                 return false;
             }
 
+            footerRect.yMax += Style.footerXOffset;
+            footerRect.yMin += Style.footerYOffset;
             //draw the background on repaint event
             if (Event.current.type == EventType.Repaint)
             {
@@ -870,6 +872,8 @@ protected static class Style
 #else
             internal static readonly float lineHeight = 16.0f;
 #endif
+            internal static readonly float footerXOffset = 0.0f;
+            internal static readonly float footerYOffset = -1.0f;
             internal static readonly float footerWidth = 60.0f;
             internal static readonly float footerButtonWidth = 25.0f;
             internal static readonly float footerButtonHeight = 13.0f;

Packages/manifest.json

@@ -7,7 +7,6 @@
     "com.unity.editorcoroutines": "1.0.0",
     "com.unity.ide.rider": "3.0.18",
     "com.unity.ide.visualstudio": "2.0.17",
-    "com.unity.ide.vscode": "1.2.5",
     "com.unity.test-framework": "1.1.31",
     "com.unity.textmeshpro": "3.0.6",
     "com.unity.timeline": "1.6.4",

Packages/packages-lock.json

@@ -10,10 +10,7 @@
       "version": "1.0.0",
       "depth": 0,
       "source": "builtin",
-      "dependencies": {
-        "com.unity.modules.tilemap": "1.0.0",
-        "com.unity.modules.uielements": "1.0.0"
-      }
+      "dependencies": {}
     },
     "com.unity.analytics": {
       "version": "3.6.12",
@@ -63,26 +60,19 @@
       },
       "url": "https://packages.unity.com"
     },
-    "com.unity.ide.vscode": {
-      "version": "1.2.5",
-      "depth": 0,
-      "source": "registry",
-      "dependencies": {},
-      "url": "https://packages.unity.com"
-    },
     "com.unity.sysroot": {
-      "version": "2.0.5",
+      "version": "1.0.0",
       "depth": 1,
       "source": "registry",
       "dependencies": {},
       "url": "https://packages.unity.com"
     },
     "com.unity.sysroot.linux-x86_64": {
-      "version": "2.0.4",
+      "version": "1.0.0",
       "depth": 1,
       "source": "registry",
       "dependencies": {
-        "com.unity.sysroot": "2.0.5"
+        "com.unity.sysroot": "1.0.0"
       },
       "url": "https://packages.unity.com"
     },
@@ -279,6 +269,17 @@
       "version": "1.0.0",
       "depth": 0,
       "source": "builtin",
+      "dependencies": {
+        "com.unity.modules.ui": "1.0.0",
+        "com.unity.modules.imgui": "1.0.0",
+        "com.unity.modules.jsonserialize": "1.0.0",
+        "com.unity.modules.uielementsnative": "1.0.0"
+      }
+    },
+    "com.unity.modules.uielementsnative": {
+      "version": "1.0.0",
+      "depth": 1,
+      "source": "builtin",
       "dependencies": {
         "com.unity.modules.ui": "1.0.0",
         "com.unity.modules.imgui": "1.0.0",

ProjectSettings/TimelineSettings.asset

@@ -0,0 +1,16 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &1
+MonoBehaviour:
+  m_ObjectHideFlags: 61
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: a287be6c49135cd4f9b2b8666c39d999, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  assetDefaultFramerate: 60
+  m_DefaultFrameRate: 60