Working on better and extendable Editors

Author: arimger

Assets/Editor Toolbox/Editor/BasicToolboxEditor.cs

@@ -0,0 +1,52 @@
+using UnityEditor;
+
+namespace Toolbox.Editor
+{
+    //TODO: new name
+    public class BasicToolboxEditor : IToolboxEditor
+    {
+        public UnityEditor.Editor ContextEditor => throw new System.NotImplementedException();
+
+        public void DrawCustomProperty(SerializedProperty property)
+        {
+            ToolboxEditorGui.DrawToolboxProperty(property);
+        }
+
+        public void DrawCustomInspector()
+        {
+            DrawCustomInspector(ContextEditor.serializedObject);
+        }
+
+        public void DrawCustomInspector(SerializedObject serializedObject)
+        {
+            if (!ToolboxDrawerModule.ToolboxDrawersAllowed)
+            {
+                ContextEditor.DrawDefaultInspector();
+                //DrawDefaultInspector();
+                return;
+            }
+
+            serializedObject.Update();
+            var property = serializedObject.GetIterator();
+            //enter to the 'Base' property
+            if (property.NextVisible(true))
+            {
+                var isScript = PropertyUtility.IsDefaultScriptProperty(property);
+                //try to draw the first property (m_Script)
+                using (new EditorGUI.DisabledScope(isScript))
+                {
+                    DrawCustomProperty(property.Copy());
+                }
+
+                //iterate over all other serialized properties
+                //NOTE: every child will be handled internally
+                while (property.NextVisible(false))
+                {
+                    DrawCustomProperty(property.Copy());
+                }
+            }
+
+            serializedObject.ApplyModifiedProperties();
+        }
+    }
+}

Assets/Editor Toolbox/Editor/BasicToolboxEditor.cs.meta

@@ -0,0 +1,9 @@
+using UnityEditor.AssetImporters;
+
+namespace Toolbox.Editor.Editors
+{
+    public class ToolboxScriptedImporterEditor : ScriptedImporterEditor
+    {
+        //TODO:
+    }
+}

Assets/Editor Toolbox/Editor/Editors.meta

@@ -0,0 +1,15 @@
+using UnityEditor;
+
+namespace Toolbox.Editor
+{
+    using Editor = UnityEditor.Editor;
+
+    public interface IToolboxEditor
+    {
+        void DrawCustomProperty(SerializedProperty property);
+        void DrawCustomInspector();
+        void DrawCustomInspector(SerializedObject serializedObject);
+
+        Editor ContextEditor { get; }
+    }
+}

Assets/Editor Toolbox/Editor/Editors/ToolboxScriptedImporterEditor.cs

@@ -13,32 +13,19 @@ namespace Toolbox.Editor
     /// </summary>
     [CustomEditor(typeof(Object), true, isFallback = true)]
     [CanEditMultipleObjects]
-    public class ToolboxEditor : Editor
+    public class ToolboxEditor : Editor, IToolboxEditor
     {
+        private readonly IToolboxEditor nestedEditor = new BasicToolboxEditor();
+
         private readonly HashSet<string> propertiesToIgnore = new HashSet<string>();
 
 
         /// <summary>
         /// Inspector GUI re-draw call.
         /// </summary>
-        public override sealed void OnInspectorGUI()
+        public sealed override void OnInspectorGUI()
         {
-            try
-            {
-                OnBeginToolboxEditor?.Invoke(this);
-                DrawCustomInspector();
-            }
-            catch (Exception)
-            {
-                //make sure to catch all Exceptions (especially ExitGUIException),
-                //it will allow us to safely dispose all layout-based controls, etc.
-                OnBreakToolboxEditor?.Invoke(this);
-                throw;
-            }
-            finally
-            {
-                OnCloseToolboxEditor?.Invoke(this);
-            }
+            ToolboxEditorHandler.HandleToolboxEditor(this);
         }
 
         /// <summary>
@@ -47,51 +34,23 @@ public override sealed void OnInspectorGUI()
         /// <param name="property">Property to display.</param>
         public virtual void DrawCustomProperty(SerializedProperty property)
         {
-            var propertyPath = property.propertyPath;
-            if (propertiesToIgnore.Contains(propertyPath))
-            {
-                return;
-            }
-
-            ToolboxEditorGui.DrawToolboxProperty(property);
+            nestedEditor.DrawCustomProperty(property);
         }
 
         /// <summary>
-        /// Draws each available property using internal <see cref="Drawers.ToolboxDrawer"/>s.
+        /// Draws each available property using internally <see cref="Drawers.ToolboxDrawer"/>s.
         /// </summary>
         public virtual void DrawCustomInspector()
         {
-            if (ToolboxDrawerModule.ToolboxDrawersAllowed)
-            {
-                serializedObject.Update();
-
-                var isExpanded = true;
-                var property = serializedObject.GetIterator();
-                //enter to the 'Base' property
-                if (property.NextVisible(isExpanded))
-                {
-                    isExpanded = false;
-                    var script = PropertyUtility.IsDefaultScriptProperty(property);
-
-                    //try to draw the first property (m_Script)
-                    using (new EditorGUI.DisabledScope(script))
-                    {
-                        DrawCustomProperty(property.Copy());
-                    }
-
-                    //iterate over all other serialized properties
-                    //NOTE: every child will be handled internally
-                    while (property.NextVisible(isExpanded))
-                    {
-                        DrawCustomProperty(property.Copy());
-                    }
-                }
-
-                serializedObject.ApplyModifiedProperties();
-                return;
-            }
+            nestedEditor.DrawCustomInspector();
+        }
 
-            DrawDefaultInspector();
+        /// <summary>
+        /// Draws each available property using internally <see cref="Drawers.ToolboxDrawer"/>s.
+        /// </summary>
+        public virtual void DrawCustomInspector(SerializedObject serializedObject)
+        {
+            nestedEditor.DrawCustomInspector(serializedObject);
         }
 
         /// <summary>
@@ -114,5 +73,7 @@ public void IgnoreProperty(string propertyPath)
         public static event Action<Editor> OnBeginToolboxEditor;
         public static event Action<Editor> OnBreakToolboxEditor;
         public static event Action<Editor> OnCloseToolboxEditor;
+
+        Editor IToolboxEditor.ContextEditor => this;
     }
 }

Assets/Editor Toolbox/Editor/Editors/ToolboxScriptedImporterEditor.cs.meta

@@ -0,0 +1,38 @@
+using System;
+
+namespace Toolbox.Editor
+{
+    using Editor = UnityEditor.Editor;
+
+    internal static class ToolboxEditorHandler
+    {
+        public static void HandleToolboxEditor(IToolboxEditor editor)
+        {
+            try
+            {
+                ContextEditor = editor.ContextEditor;
+                OnBeginToolboxEditor?.Invoke(ContextEditor);
+                editor.DrawCustomInspector();
+            }
+            catch (Exception)
+            {
+                //make sure to catch all Exceptions (especially ExitGUIException),
+                //it will allow us to safely dispose all layout-based controls, etc.
+                OnBreakToolboxEditor?.Invoke(ContextEditor);
+                throw;
+            }
+            finally
+            {
+                OnCloseToolboxEditor?.Invoke(ContextEditor);
+                ContextEditor = null;
+            }
+        }
+
+
+        public static event Action<Editor> OnBeginToolboxEditor;
+        public static event Action<Editor> OnBreakToolboxEditor;
+        public static event Action<Editor> OnCloseToolboxEditor;
+
+        public static Editor ContextEditor { get; private set; }
+    }
+}