Ability to decide if EditorButton should be rendered below or above the target property; minor SerializedScene API improvements; minor refactor changes

Author: arimger

Assets/Editor Toolbox/Editor/Drawers/Toolbox/Decorator/EditorButtonAttributeDrawer.cs

@@ -8,6 +8,31 @@ namespace Toolbox.Editor.Drawers
 {
     public class EditorButtonAttributeDrawer : ToolboxDecoratorDrawer<EditorButtonAttribute>
     {
+        private void DrawButton(EditorButtonAttribute attribute)
+        {
+            var declaringObjects = GetDeclaringObjects();
+            if (declaringObjects == null || declaringObjects.Length == 0)
+            {
+                //NOTE: something went really wrong, internal bug or OnGuiBeginSafe was called out of the Toolbox scope
+                return;
+            }
+
+            var disable = !IsClickable(attribute, declaringObjects);
+            using (new EditorGUI.DisabledScope(disable))
+            {
+                var label = string.IsNullOrEmpty(attribute.ExtraLabel)
+                            ? ObjectNames.NicifyVariableName(attribute.MethodName)
+                            : attribute.ExtraLabel;
+                var tooltip = attribute.Tooltip;
+                var content = new GUIContent(label, tooltip);
+
+                if (GUILayout.Button(content, Style.buttonStyle))
+                {
+                    CallMethods(attribute, declaringObjects);
+                }
+            }
+        }
+
         private MethodInfo GetMethod(EditorButtonAttribute attribute, object[] targetObjects, string methodName)
         {
             var methodInfo = ReflectionUtility.GetMethod(methodName, targetObjects);
@@ -119,29 +144,25 @@ private void CallMethods(EditorButtonAttribute attribute, object[] targetObjects
             }
         }
 
-        protected override void OnGuiCloseSafe(EditorButtonAttribute attribute)
+        protected override void OnGuiBeginSafe(EditorButtonAttribute attribute)
         {
-            var declaringObjects = GetDeclaringObjects();
-            if (declaringObjects == null || declaringObjects.Length == 0)
+            if (attribute.PositionType != ButtonPositionType.Above)
             {
-                //NOTE: something went really wrong, internal bug or OnGuiBeginSafe was called out of the Toolbox scope
                 return;
             }
 
-            var disable = !IsClickable(attribute, declaringObjects);
-            using (new EditorGUI.DisabledScope(disable))
-            {
-                var label = string.IsNullOrEmpty(attribute.ExtraLabel)
-                            ? ObjectNames.NicifyVariableName(attribute.MethodName)
-                            : attribute.ExtraLabel;
-                var tooltip = attribute.Tooltip;
-                var content = new GUIContent(label, tooltip);
+            DrawButton(attribute);
+        }
 
-                if (GUILayout.Button(content, Style.buttonStyle))
-                {
-                    CallMethods(attribute, declaringObjects);
-                }
+        protected override void OnGuiCloseSafe(EditorButtonAttribute attribute)
+        {
+            if (attribute.PositionType != ButtonPositionType.Default &&
+                attribute.PositionType != ButtonPositionType.Below)
+            {
+                return;
             }
+
+            DrawButton(attribute);
         }
 
         private static class Style

Assets/Editor Toolbox/Editor/ToolboxEditorGui.cs

@@ -528,12 +528,7 @@ public static void DrawPropertyChildren(SerializedProperty property, Action<Seri
                 enterChildren = false;
                 var childProperty = targetProperty.Copy();
                 //handle current property using Toolbox features
-                EditorGUI.BeginChangeCheck();
                 drawElementAction(childProperty);
-                if (EditorGUI.EndChangeCheck())
-                {
-                    break;
-                }
             }
         }
 

Assets/Editor Toolbox/Runtime/Attributes/Property/Toolbox/DecoratorAttributes/EditorButtonAttribute.cs

@@ -27,7 +27,15 @@ public EditorButtonAttribute(string methodName, string extraLabel = null, Button
         public string ValidateMethodName { get; set; }
         public string ExtraLabel { get; private set; }
         public string Tooltip { get; set; }
-        public ButtonActivityType ActivityType { get; private set; }
+        public ButtonActivityType ActivityType { get; set; }
+        public ButtonPositionType PositionType { get; set; } = ButtonPositionType.Default;
+    }
+
+    public enum ButtonPositionType
+    {
+        Default,
+        Below,
+        Above
     }
 
     [Flags]

Assets/Editor Toolbox/Runtime/Serialization/SerializedScene.cs

@@ -33,18 +33,42 @@ void ISerializationCallbackReceiver.OnBeforeSerialize()
         void ISerializationCallbackReceiver.OnAfterDeserialize()
         { }
 
+        public void UpdateProperties()
+        {
+            UpdateProperties(out _);
+        }
 
-        private void UpdateProperties()
+        public void UpdateProperties(out bool anythingChanged)
         {
+            anythingChanged = false;
 #if UNITY_EDITOR
             if (SceneSerializationUtility.TryGetSceneData(sceneReference, out var sceneData))
             {
-                SceneName = sceneData.SceneName;
-                ScenePath = sceneData.ScenePath;
-                BuildIndex = sceneData.BuildIndex;
+                if (SceneName != sceneData.SceneName)
+                {
+                    SceneName = sceneData.SceneName;
+                    anythingChanged = true;
+                }
+
+                if (ScenePath != sceneData.ScenePath)
+                {
+                    ScenePath = sceneData.ScenePath;
+                    anythingChanged = true;
+                }
+
+                if (BuildIndex != sceneData.BuildIndex)
+                {
+                    BuildIndex = sceneData.BuildIndex;
+                    anythingChanged = true;
+                }
             }
             else
             {
+                if (!string.IsNullOrEmpty(sceneName))
+                {
+                    anythingChanged = true;
+                }
+
                 SceneName = string.Empty;
                 ScenePath = string.Empty;
                 BuildIndex = -1;

Assets/Examples/Scripts/SampleBehaviour4.cs

@@ -34,7 +34,7 @@ private string GetHelpMessage()
 
     [Label("Button", skinStyle: SkinStyle.Box)]
 
-    [EditorButton(nameof(TestMethod), Tooltip = "Custom Tooltip", ValidateMethodName = nameof(ValidationMethod))]
+    [EditorButton(nameof(TestMethod), Tooltip = "Custom Tooltip", ValidateMethodName = nameof(ValidationMethod), PositionType = ButtonPositionType.Above)]
     [EditorButton(nameof(TestCoroutine), "<b>Test Coroutine</b>", activityType: ButtonActivityType.OnPlayMode)]
     [EditorButton(nameof(TestStaticMethod), activityType: ButtonActivityType.OnEditMode)]
     public int var1;