Merge pull request #137 from arimger/develop

Develop - 0.14.1

Author: arimger

Assets/Editor Toolbox/CHANGELOG.md

@@ -1,3 +1,10 @@
+## 0.14.1 [22.04.2025]
+
+### Changed:
+- Ability to define [EditorButton] position (below or above the target property)
+- Improvements to the SerializedScene class & linked drawer
+- Fix rare issue with nested layouts
+
 ## 0.14.0 [23.02.2025]
 
 ### Added:

Assets/Editor Toolbox/Editor/Drawers/Regular/PropertyDrawerBase.cs

@@ -48,8 +48,7 @@ public sealed override void OnGUI(Rect position, SerializedProperty property, GU
             }
 
             ToolboxEditorLog.WrongAttributeUsageWarning(attribute, property);
-            //create additional warning label based on the property name
-            var warningContent = new GUIContent(property.displayName + " has invalid property drawer");
+            var warningContent = new GUIContent($"{property.displayName} has invalid property drawer");
             ToolboxEditorGui.DrawEmptyProperty(position, property, warningContent);
         }
 

Assets/Editor Toolbox/Editor/Drawers/Regular/SerializedSceneDrawer.cs

@@ -1,4 +1,5 @@
-using UnityEditor;
+using Toolbox.Editor.Internal;
+using UnityEditor;
 using UnityEngine;
 
 namespace Toolbox.Editor.Drawers
@@ -28,29 +29,39 @@ private void OpenBuildSettings()
             EditorWindow.GetWindow(typeof(BuildPlayerWindow));
         }
 
-
-        protected override float GetPropertyHeightSafe(SerializedProperty property, GUIContent label)
-        {
-            var lineHeight = EditorGUIUtility.singleLineHeight + EditorGUIUtility.standardVerticalSpacing;
-            return HasSceneDetails(property)
-                ? base.GetPropertyHeightSafe(property, label) + lineHeight * 2
-                : base.GetPropertyHeightSafe(property, label);
-        }
-
         protected override void OnGUISafe(Rect position, SerializedProperty property, GUIContent label)
         {
+            var hasDetails = HasSceneDetails(property);
             EditorGUI.BeginProperty(position, label, property);
             position.height = EditorGUIUtility.singleLineHeight;
-            position = EditorGUI.PrefixLabel(position, label);
+            if (hasDetails)
+            {
+                position.xMax -= Style.foldoutWidth;
+            }
+
             var sceneProperty = property.FindPropertyRelative("sceneReference");
-            EditorGUI.ObjectField(position, sceneProperty, GUIContent.none);
+            EditorGUI.ObjectField(position, sceneProperty, label);
             EditorGUI.EndProperty();
 
-            if (!HasSceneDetails(property))
+            if (hasDetails)
+            {
+                var prevXMin = position.xMin;
+                position.xMin = position.xMax;
+                position.xMax += Style.foldoutWidth;
+                using (new DisabledScope(true))
+                {
+                    property.isExpanded = GUI.Toggle(position, property.isExpanded, Style.foldoutContent, Style.foldoutStyle);
+                }
+
+                position.xMin = prevXMin;
+            }
+
+            if (!hasDetails || !property.isExpanded)
             {
                 return;
             }
 
+            EditorGUI.indentLevel++;
             var sceneData = SceneData.GetSceneDataFromIndex(property);
             var spacing = EditorGUIUtility.standardVerticalSpacing;
             position.y += EditorGUIUtility.singleLineHeight + spacing;
@@ -64,20 +75,21 @@ protected override void OnGUISafe(Rect position, SerializedProperty property, GU
                 EditorGUI.LabelField(position, Style.notInBuildContent);
                 position.y += EditorGUIUtility.singleLineHeight + spacing;
                 EditorGUI.EndDisabledGroup();
-                if (GUI.Button(position, Style.showDetailsContent))
+                var buttonRect = EditorGUI.IndentedRect(position);
+                if (GUI.Button(buttonRect, Style.showDetailsContent))
                 {
                     OpenBuildSettings();
                 }
             }
-        }
 
+            EditorGUI.indentLevel--;
+        }
 
         public override bool IsPropertyValid(SerializedProperty property)
         {
             return property.type == nameof(SerializedScene);
         }
 
-
         private struct SceneData
         {
             public int index;
@@ -134,10 +146,28 @@ public static SceneData GetSceneDataFromScene(SerializedProperty property)
 
         private static class Style
         {
+            internal const float foldoutWidth = 50.0f;
+
+            internal static readonly GUIContent foldoutContent = new GUIContent("Details", "Show/Hide Scene Details");
             internal static readonly GUIContent buildIndexContent = new GUIContent("Build Index");
             internal static readonly GUIContent isEnabledContent = new GUIContent("Is Enabled");
             internal static readonly GUIContent notInBuildContent = new GUIContent("Not in Build");
             internal static readonly GUIContent showDetailsContent = new GUIContent("Open Build Settings");
+
+            internal static readonly GUIStyle foldoutStyle;
+
+            static Style()
+            {
+                foldoutStyle = new GUIStyle(EditorStyles.miniButton)
+                {
+#if UNITY_2019_3_OR_NEWER
+                    fontSize = 10,
+#else
+                    fontSize = 9,
+#endif
+                    alignment = TextAnchor.MiddleCenter
+                };
+            }
         }
     }
 }

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/Management/ToolboxManager.cs

@@ -213,7 +213,12 @@ void ReintializeProvider()
 
                     if (GUILayout.Button("Create a new settings file"))
                     {
-                        var settingsInstance = ScriptableObject.CreateInstance(settingsType);
+                        var settingsInstance = ScriptableObject.CreateInstance<ToolboxEditorSettings>();
+                        if (settingsInstance == null)
+                        {
+                            ToolboxEditorLog.LogError($"Something went wrong. Cannot create a new Settings file.");
+                            return;
+                        }
 
                         var locationPath = EditorUtility.OpenFolderPanel("New Settings file location", "Assets", "");
                         //validate returned path and create relative one if possible

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/README.md

@@ -417,7 +417,7 @@ public int var1;
 ![inspector](https://github.com/arimger/Unity-Editor-Toolbox/blob/develop/Docs/horizontal.png)
 
 ```csharp
-[EditorButton(nameof(MyMethod), "<b>My</b> Custom Label", activityType: ButtonActivityType.OnPlayMode, ValidateMethodName = nameof(ValidationMethod))]
+[EditorButton(nameof(MyMethod), "<b>My</b> Custom Label", activityType: ButtonActivityType.OnPlayMode, ValidateMethodName = nameof(ValidationMethod), PositionType = ButtonPositionType.Above)]
 public int var1;
 
 private void MyMethod()

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/Editor Toolbox/package.json

@@ -1,7 +1,7 @@
 {
   "name": "com.browar.editor-toolbox",
   "displayName": "Editor Toolbox",
-  "version": "0.14.0",
+  "version": "0.14.1",
   "unity": "2018.1",
   "description": "Tools, custom attributes, drawers, hierarchy overlay, and other extensions for the Unity Editor.",
   "keywords": [