Minor refactor changes

arimger · arimger · commit b3bb3942921a · 2022-11-11T01:20:01.000+01:00
diff --git a/Assets/Editor Toolbox/Editor/BasicToolboxEditor.cs b/Assets/Editor Toolbox/Editor/BasicToolboxEditor.cs
@@ -2,10 +2,15 @@
 
 namespace Toolbox.Editor
 {
+    using Editor = UnityEditor.Editor;
+
     //TODO: new name
     public class BasicToolboxEditor : IToolboxEditor
     {
-        public UnityEditor.Editor ContextEditor => throw new System.NotImplementedException();
+        public BasicToolboxEditor(Editor contextEditor)
+        {
+            ContextEditor = contextEditor;
+        }
 
         public void DrawCustomProperty(SerializedProperty property)
         {
@@ -22,7 +27,6 @@ public void DrawCustomInspector(SerializedObject serializedObject)
             if (!ToolboxDrawerModule.ToolboxDrawersAllowed)
             {
                 ContextEditor.DrawDefaultInspector();
-                //DrawDefaultInspector();
                 return;
             }
 
@@ -48,5 +52,7 @@ public void DrawCustomInspector(SerializedObject serializedObject)
 
             serializedObject.ApplyModifiedProperties();
         }
+
+        public Editor ContextEditor { get; }
     }
 }
diff --git a/Assets/Editor Toolbox/Editor/Drawers/Toolbox/Decorator/BeginGroupAttributeDrawer.cs b/Assets/Editor Toolbox/Editor/Drawers/Toolbox/Decorator/BeginGroupAttributeDrawer.cs
@@ -7,7 +7,7 @@ public class BeginGroupAttributeDrawer : ToolboxDecoratorDrawer<BeginGroupAttrib
     {
         protected override void OnGuiBeginSafe(BeginGroupAttribute attribute)
         {
-            ToolboxLayoutHelper.BeginVertical(Style.groupBackgroundStyle);
+            ToolboxLayoutHandler.BeginVertical(Style.groupBackgroundStyle);
             if (attribute.HasLabel)
             {
                 GUILayout.Label(attribute.Label, EditorStyles.boldLabel);
diff --git a/Assets/Editor Toolbox/Editor/Drawers/Toolbox/Decorator/BeginHorizontalAttributeDrawer.cs b/Assets/Editor Toolbox/Editor/Drawers/Toolbox/Decorator/BeginHorizontalAttributeDrawer.cs
@@ -13,7 +13,7 @@ protected override void OnGuiBeginSafe(BeginHorizontalAttribute attribute)
             EditorGUIUtility.fieldWidth = width * attribute.FieldToWidthRatio;
 
             //begin horizontal group using internal utility
-            ToolboxLayoutHelper.BeginHorizontal();
+            ToolboxLayoutHandler.BeginHorizontal();
         }
     }
 }
diff --git a/Assets/Editor Toolbox/Editor/Drawers/Toolbox/Decorator/BeginHorizontalGroupAttributeDrawer.cs b/Assets/Editor Toolbox/Editor/Drawers/Toolbox/Decorator/BeginHorizontalGroupAttributeDrawer.cs
@@ -37,14 +37,14 @@ protected override void OnGuiBeginSafe(BeginHorizontalGroupAttribute attribute)
             EditorGUIUtility.labelWidth = fixedWidth * attribute.LabelToWidthRatio;
             EditorGUIUtility.fieldWidth = fixedWidth * attribute.FieldToWidthRatio;
 
-            ToolboxLayoutHelper.BeginVertical(Style.groupBackgroundStyle);
+            ToolboxLayoutHandler.BeginVertical(Style.groupBackgroundStyle);
             if (attribute.HasLabel)
             {
                 GUILayout.Label(attribute.Label, EditorStyles.boldLabel);
             }
 
             HandleScrollView(fixedHeight);
-            ToolboxLayoutHelper.BeginHorizontal();
+            ToolboxLayoutHandler.BeginHorizontal();
         }
 
 
diff --git a/Assets/Editor Toolbox/Editor/Drawers/Toolbox/Decorator/BeginVerticalAttributeDrawer.cs b/Assets/Editor Toolbox/Editor/Drawers/Toolbox/Decorator/BeginVerticalAttributeDrawer.cs
@@ -6,7 +6,7 @@ public class BeginVerticalAttributeDrawer : ToolboxDecoratorDrawer<BeginVertical
     {
         protected override void OnGuiBeginSafe(BeginVerticalAttribute attribute)
         {
-            ToolboxLayoutHelper.BeginVertical();
+            ToolboxLayoutHandler.BeginVertical();
         }
     }
 }
diff --git a/Assets/Editor Toolbox/Editor/Drawers/Toolbox/Decorator/EndGroupAttributeDrawer.cs b/Assets/Editor Toolbox/Editor/Drawers/Toolbox/Decorator/EndGroupAttributeDrawer.cs
@@ -6,7 +6,7 @@ public class EndGroupAttributeDrawer : ToolboxDecoratorDrawer<EndGroupAttribute>
     {
         protected override void OnGuiCloseSafe(EndGroupAttribute attribute)
         {
-            ToolboxLayoutHelper.CloseVertical();
+            ToolboxLayoutHandler.CloseVertical();
         }
     }
 }
diff --git a/Assets/Editor Toolbox/Editor/Drawers/Toolbox/Decorator/EndHorizontalAttributeDrawer.cs b/Assets/Editor Toolbox/Editor/Drawers/Toolbox/Decorator/EndHorizontalAttributeDrawer.cs
@@ -8,7 +8,7 @@ public class EndHorizontalAttributeDrawer : ToolboxDecoratorDrawer<EndHorizontal
         protected override void OnGuiCloseSafe(EndHorizontalAttribute attribute)
         {
             //end horizontal group
-            ToolboxLayoutHelper.CloseHorizontal();
+            ToolboxLayoutHandler.CloseHorizontal();
 
             //restore label & field 
             EditorGUIUtility.labelWidth = 0.0f;
diff --git a/Assets/Editor Toolbox/Editor/Drawers/Toolbox/Decorator/EndHorizontalGroupAttributeDrawer.cs b/Assets/Editor Toolbox/Editor/Drawers/Toolbox/Decorator/EndHorizontalGroupAttributeDrawer.cs
@@ -7,9 +7,9 @@ public class EndHorizontalGroupAttributeDrawer : ToolboxDecoratorDrawer<EndHoriz
     {
         protected override void OnGuiCloseSafe(EndHorizontalGroupAttribute attribute)
         {
-            ToolboxLayoutHelper.CloseHorizontal();
+            ToolboxLayoutHandler.CloseHorizontal();
             EditorGUILayout.EndScrollView();
-            ToolboxLayoutHelper.CloseVertical();
+            ToolboxLayoutHandler.CloseVertical();
 
             EditorGUIUtility.labelWidth = 0.0f;
             EditorGUIUtility.fieldWidth = 0.0f;
diff --git a/Assets/Editor Toolbox/Editor/Drawers/Toolbox/Decorator/EndVerticalAttributeDrawer.cs b/Assets/Editor Toolbox/Editor/Drawers/Toolbox/Decorator/EndVerticalAttributeDrawer.cs
@@ -6,7 +6,7 @@ public class EndVerticalAttributeDrawer : ToolboxDecoratorDrawer<EndVerticalAttr
     {
         protected override void OnGuiCloseSafe(EndVerticalAttribute attribute)
         {
-            ToolboxLayoutHelper.CloseVertical();
+            ToolboxLayoutHandler.CloseVertical();
         }
     }
 }
diff --git a/Assets/Editor Toolbox/Editor/ToolboxEditor.cs b/Assets/Editor Toolbox/Editor/ToolboxEditor.cs
@@ -1,5 +1,4 @@
-﻿using System;
-using System.Collections.Generic;
+﻿using System.Collections.Generic;
 
 using UnityEditor;
 
@@ -15,16 +14,17 @@ namespace Toolbox.Editor
     [CanEditMultipleObjects]
     public class ToolboxEditor : Editor, IToolboxEditor
     {
-        private readonly IToolboxEditor nestedEditor = new BasicToolboxEditor();
-
         private readonly HashSet<string> propertiesToIgnore = new HashSet<string>();
 
+        //TODO: better initialization
+        private IToolboxEditor nestedEditor;
 
         /// <summary>
         /// Inspector GUI re-draw call.
         /// </summary>
         public sealed override void OnInspectorGUI()
         {
+            nestedEditor ??= new BasicToolboxEditor(this);
             ToolboxEditorHandler.HandleToolboxEditor(this);
         }
 
@@ -69,11 +69,6 @@ public void IgnoreProperty(string propertyPath)
             propertiesToIgnore.Add(propertyPath);
         }
 
-
-        public static event Action<Editor> OnBeginToolboxEditor;
-        public static event Action<Editor> OnBreakToolboxEditor;
-        public static event Action<Editor> OnCloseToolboxEditor;
-
         Editor IToolboxEditor.ContextEditor => this;
     }
 }
diff --git a/Assets/Editor Toolbox/Editor/ToolboxEditorHandler.cs b/Assets/Editor Toolbox/Editor/ToolboxEditorHandler.cs
@@ -6,6 +6,7 @@ namespace Toolbox.Editor
 
     internal static class ToolboxEditorHandler
     {
+        //TODO: how to pass dditor and multiple serialized objects
         public static void HandleToolboxEditor(IToolboxEditor editor)
         {
             try
diff --git a/Assets/Editor Toolbox/Editor/ToolboxLayoutHandler.cs b/Assets/Editor Toolbox/Editor/ToolboxLayoutHandler.cs
@@ -10,17 +10,17 @@ namespace Toolbox.Editor
     /// <para>Remark: can be used only within the Toolbox Editors.</para>
     /// </summary>
     [InitializeOnLoad]
-    internal static class ToolboxLayoutHelper
+    internal static class ToolboxLayoutHandler
     {
-        static ToolboxLayoutHelper()
+        static ToolboxLayoutHandler()
         {
             //events exposed by the ToolboxEditor are used to maintain created layout data
             //previously created scopes are validated and closed if it is needed
             //additionally this class sends appropriate warning messages to the Console window
 
-            ToolboxEditor.OnBeginToolboxEditor += OnBeginEditor;
-            ToolboxEditor.OnBreakToolboxEditor += OnBreakEditor;
-            ToolboxEditor.OnCloseToolboxEditor += OnCloseEditor;
+            ToolboxEditorHandler.OnBeginToolboxEditor += OnBeginEditor;
+            ToolboxEditorHandler.OnBreakToolboxEditor += OnBreakEditor;
+            ToolboxEditorHandler.OnCloseToolboxEditor += OnCloseEditor;
 
             //we have to reset the current state between Editors to keep values independent
             InspectorUtility.OnEditorReload += ResetCache;
diff --git a/Assets/Editor Toolbox/Editor/ToolboxLayoutHandler.cs.meta b/Assets/Editor Toolbox/Editor/ToolboxLayoutHandler.cs.meta
diff --git a/Assets/Editor Toolbox/Editor/Utilities/InspectorUtility.cs b/Assets/Editor Toolbox/Editor/Utilities/InspectorUtility.cs
@@ -17,13 +17,13 @@ internal static partial class InspectorUtility
         static InspectorUtility()
         {
             //we can use each new Editor to check if 'OnEditorReload' should be called
-            ToolboxEditor.OnBeginToolboxEditor += CheckReloads;
+            ToolboxEditorHandler.OnBeginToolboxEditor += CheckReloads;
 
             //we can use 'OnBeginToolboxEditor' and 'OnCloseToolboxEditor' to cache 
             //processed Editors and determine the real context of the serialization
-            ToolboxEditor.OnBeginToolboxEditor += OnBeginEditor;
-            ToolboxEditor.OnBreakToolboxEditor += OnBreakEditor;
-            ToolboxEditor.OnCloseToolboxEditor += OnCloseEditor;
+            ToolboxEditorHandler.OnBeginToolboxEditor += OnBeginEditor;
+            ToolboxEditorHandler.OnBreakToolboxEditor += OnBreakEditor;
+            ToolboxEditorHandler.OnCloseToolboxEditor += OnCloseEditor;
         }
 
 

Original file line number	Diff line number	Diff line change
`@@ -2,10 +2,15 @@`
`2`	`2`
`3`	`3`	`namespace Toolbox.Editor`
`4`	`4`	`{`
	`5`	`+ using Editor = UnityEditor.Editor;`
	`6`	`+`
`5`	`7`	`//TODO: new name`
`6`	`8`	`public class BasicToolboxEditor : IToolboxEditor`
`7`	`9`	`{`
`8`		`- public UnityEditor.Editor ContextEditor => throw new System.NotImplementedException();`
	`10`	`+ public BasicToolboxEditor(Editor contextEditor)`
	`11`	`+ {`
	`12`	`+ ContextEditor = contextEditor;`
	`13`	`+ }`
`9`	`14`
`10`	`15`	`public void DrawCustomProperty(SerializedProperty property)`
`11`	`16`	`{`
`@@ -22,7 +27,6 @@ public void DrawCustomInspector(SerializedObject serializedObject)`
`22`	`27`	`if (!ToolboxDrawerModule.ToolboxDrawersAllowed)`
`23`	`28`	`{`
`24`	`29`	`ContextEditor.DrawDefaultInspector();`
`25`		`- //DrawDefaultInspector();`
`26`	`30`	`return;`
`27`	`31`	`}`
`28`	`32`
`@@ -48,5 +52,7 @@ public void DrawCustomInspector(SerializedObject serializedObject)`
`48`	`52`
`49`	`53`	`serializedObject.ApplyModifiedProperties();`
`50`	`54`	`}`
	`55`	`+`
	`56`	`+ public Editor ContextEditor { get; }`
`51`	`57`	`}`
`52`	`58`	`}`
Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@ public class BeginGroupAttributeDrawer : ToolboxDecoratorDrawer<BeginGroupAttrib`
`7`	`7`	`{`
`8`	`8`	`protected override void OnGuiBeginSafe(BeginGroupAttribute attribute)`
`9`	`9`	`{`
`10`		`- ToolboxLayoutHelper.BeginVertical(Style.groupBackgroundStyle);`
	`10`	`+ ToolboxLayoutHandler.BeginVertical(Style.groupBackgroundStyle);`
`11`	`11`	`if (attribute.HasLabel)`
`12`	`12`	`{`
`13`	`13`	`GUILayout.Label(attribute.Label, EditorStyles.boldLabel);`
Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@ protected override void OnGuiBeginSafe(BeginHorizontalAttribute attribute)`
`13`	`13`	`EditorGUIUtility.fieldWidth = width * attribute.FieldToWidthRatio;`
`14`	`14`
`15`	`15`	`//begin horizontal group using internal utility`
`16`		`- ToolboxLayoutHelper.BeginHorizontal();`
	`16`	`+ ToolboxLayoutHandler.BeginHorizontal();`
`17`	`17`	`}`
`18`	`18`	`}`
`19`	`19`	`}`
Original file line number	Diff line number	Diff line change
`@@ -37,14 +37,14 @@ protected override void OnGuiBeginSafe(BeginHorizontalGroupAttribute attribute)`
`37`	`37`	`EditorGUIUtility.labelWidth = fixedWidth * attribute.LabelToWidthRatio;`
`38`	`38`	`EditorGUIUtility.fieldWidth = fixedWidth * attribute.FieldToWidthRatio;`
`39`	`39`
`40`		`- ToolboxLayoutHelper.BeginVertical(Style.groupBackgroundStyle);`
	`40`	`+ ToolboxLayoutHandler.BeginVertical(Style.groupBackgroundStyle);`
`41`	`41`	`if (attribute.HasLabel)`
`42`	`42`	`{`
`43`	`43`	`GUILayout.Label(attribute.Label, EditorStyles.boldLabel);`
`44`	`44`	`}`
`45`	`45`
`46`	`46`	`HandleScrollView(fixedHeight);`
`47`		`- ToolboxLayoutHelper.BeginHorizontal();`
	`47`	`+ ToolboxLayoutHandler.BeginHorizontal();`
`48`	`48`	`}`
`49`	`49`
`50`	`50`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@ public class BeginVerticalAttributeDrawer : ToolboxDecoratorDrawer<BeginVertical`
`6`	`6`	`{`
`7`	`7`	`protected override void OnGuiBeginSafe(BeginVerticalAttribute attribute)`
`8`	`8`	`{`
`9`		`- ToolboxLayoutHelper.BeginVertical();`
	`9`	`+ ToolboxLayoutHandler.BeginVertical();`
`10`	`10`	`}`
`11`	`11`	`}`
`12`	`12`	`}`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@ public class EndGroupAttributeDrawer : ToolboxDecoratorDrawer<EndGroupAttribute>`
`6`	`6`	`{`
`7`	`7`	`protected override void OnGuiCloseSafe(EndGroupAttribute attribute)`
`8`	`8`	`{`
`9`		`- ToolboxLayoutHelper.CloseVertical();`
	`9`	`+ ToolboxLayoutHandler.CloseVertical();`
`10`	`10`	`}`
`11`	`11`	`}`
`12`	`12`	`}`
Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@ public class EndHorizontalAttributeDrawer : ToolboxDecoratorDrawer<EndHorizontal`
`8`	`8`	`protected override void OnGuiCloseSafe(EndHorizontalAttribute attribute)`
`9`	`9`	`{`
`10`	`10`	`//end horizontal group`
`11`		`- ToolboxLayoutHelper.CloseHorizontal();`
	`11`	`+ ToolboxLayoutHandler.CloseHorizontal();`
`12`	`12`
`13`	`13`	`//restore label & field`
`14`	`14`	`EditorGUIUtility.labelWidth = 0.0f;`
Original file line number	Diff line number	Diff line change
`@@ -7,9 +7,9 @@ public class EndHorizontalGroupAttributeDrawer : ToolboxDecoratorDrawer<EndHoriz`
`7`	`7`	`{`
`8`	`8`	`protected override void OnGuiCloseSafe(EndHorizontalGroupAttribute attribute)`
`9`	`9`	`{`
`10`		`- ToolboxLayoutHelper.CloseHorizontal();`
	`10`	`+ ToolboxLayoutHandler.CloseHorizontal();`
`11`	`11`	`EditorGUILayout.EndScrollView();`
`12`		`- ToolboxLayoutHelper.CloseVertical();`
	`12`	`+ ToolboxLayoutHandler.CloseVertical();`
`13`	`13`
`14`	`14`	`EditorGUIUtility.labelWidth = 0.0f;`
`15`	`15`	`EditorGUIUtility.fieldWidth = 0.0f;`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@ public class EndVerticalAttributeDrawer : ToolboxDecoratorDrawer<EndVerticalAttr`
`6`	`6`	`{`
`7`	`7`	`protected override void OnGuiCloseSafe(EndVerticalAttribute attribute)`
`8`	`8`	`{`
`9`		`- ToolboxLayoutHelper.CloseVertical();`
	`9`	`+ ToolboxLayoutHandler.CloseVertical();`
`10`	`10`	`}`
`11`	`11`	`}`
`12`	`12`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,4 @@`
`1`		`-using System;`
`2`		`-using System.Collections.Generic;`
	`1`	`+using System.Collections.Generic;`
`3`	`2`
`4`	`3`	`using UnityEditor;`
`5`	`4`
`@@ -15,16 +14,17 @@ namespace Toolbox.Editor`
`15`	`14`	`[CanEditMultipleObjects]`
`16`	`15`	`public class ToolboxEditor : Editor, IToolboxEditor`
`17`	`16`	`{`
`18`		`- private readonly IToolboxEditor nestedEditor = new BasicToolboxEditor();`
`19`		`-`
`20`	`17`	`private readonly HashSet<string> propertiesToIgnore = new HashSet<string>();`
`21`	`18`
	`19`	`+ //TODO: better initialization`
	`20`	`+ private IToolboxEditor nestedEditor;`
`22`	`21`
`23`	`22`	`/// <summary>`
`24`	`23`	`/// Inspector GUI re-draw call.`
`25`	`24`	`/// </summary>`
`26`	`25`	`public sealed override void OnInspectorGUI()`
`27`	`26`	`{`
	`27`	`+ nestedEditor ??= new BasicToolboxEditor(this);`
`28`	`28`	`ToolboxEditorHandler.HandleToolboxEditor(this);`
`29`	`29`	`}`
`30`	`30`
`@@ -69,11 +69,6 @@ public void IgnoreProperty(string propertyPath)`
`69`	`69`	`propertiesToIgnore.Add(propertyPath);`
`70`	`70`	`}`
`71`	`71`
`72`		`-`
`73`		`- public static event Action<Editor> OnBeginToolboxEditor;`
`74`		`- public static event Action<Editor> OnBreakToolboxEditor;`
`75`		`- public static event Action<Editor> OnCloseToolboxEditor;`
`76`		`-`
`77`	`72`	`Editor IToolboxEditor.ContextEditor => this;`
`78`	`73`	`}`
`79`	`74`	`}`