Merge pull request #73 from arimger/develop

Develop - 0.12.1

Author: arimger

Assets/Editor Toolbox/CHANGELOG.md

@@ -1,3 +1,9 @@
+## 0.12.1 [12.04.2023]
+
+### Changed:
+- Fix LabelByChild usage within lists
+- Possibility to foldout/in dictionaries
+
 ## 0.12.0 [10.12.2022]
 
 ### Changed:

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

@@ -17,18 +17,26 @@ static SerializedDictionaryDrawer()
                 var pairsProperty = a.pairsProperty;
                 var errorProperty = a.errorProperty;
 
-                var list = new ToolboxEditorList(pairsProperty, "Pair", true, true, false);
+                var list = new ToolboxEditorList(pairsProperty, "Pair", true, true, false)
+                {
+                    Foldable = true
+                };
                 list.drawHeaderCallback += (rect) =>
                 {
                     //cache preprocessed label to get prefab related functions
                     var label = EditorGUI.BeginProperty(rect, null, p);
+
                     //create additional warning message if there is a collision
                     if (errorProperty.boolValue)
                     {
-                        label.image = EditorGuiUtility.GetHelpIcon(MessageType.Warning);
                         label.text += string.Format(" [{0}]", Style.warningMessage);
+                        var warningRect = rect;
+                        warningRect.xMin = warningRect.xMax - Style.warningIconOffset;
+                        var warningIcon = new GUIContent(EditorGuiUtility.GetHelpIcon(MessageType.Warning));
+                        EditorGUI.LabelField(warningRect, warningIcon);
                     }
-                    EditorGUI.LabelField(rect, label);
+
+                    list.DrawStandardFoldout(rect, label);
                     EditorGUI.EndProperty();
                 };
                 list.drawFooterCallback += (rect) =>
@@ -87,6 +95,7 @@ public override bool UseForChildren()
 
         private static class Style
         {
+            internal static readonly float warningIconOffset = 25.0f;
             internal static readonly string warningMessage = "keys are not unique, it will break deserialization";
         }
 

Assets/Editor Toolbox/Editor/Drawers/Toolbox/TargetType/SerializedDictionaryDrawer.cs

@@ -7,8 +7,8 @@
 namespace Toolbox.Editor
 {
     using Toolbox.Editor.Drawers;
-    using Toolbox.Editor.Hierarchy;
     using Toolbox.Editor.Folders;
+    using Toolbox.Editor.Hierarchy;
 
     internal interface IToolboxGeneralSettings
     { }
@@ -201,6 +201,37 @@ private void OnValidate()
 
         #endregion
 
+        public void Reset()
+        {
+            ResetHierarchySettings();
+            ResetProjectSettings();
+            ResetInspectorSettings();
+        }
+
+        public void ResetHierarchySettings()
+        {
+            UseToolboxHierarchy = true;
+            RowDataTypes = Defaults.rowDataTypes;
+            DrawHorizontalLines = true;
+            ShowSelectionsCount = true;
+        }
+
+        public void ResetProjectSettings()
+        {
+            UseToolboxProject = true;
+            ResetIconRectProperties();
+            CustomFolders = new List<FolderData>();
+        }
+
+        public void ResetInspectorSettings()
+        {
+            UseToolboxDrawers = true;
+            SetAllPossibleDecoratorDrawers();
+            SetAllPossibleConditionDrawers();
+            SetAllPossibleSelfPropertyDrawers();
+            SetAllPossibleListPropertyDrawers();
+            SetAllPossibleTargetTypeDrawers();
+        }
 
         public void SetAllPossibleDecoratorDrawers()
         {
@@ -252,7 +283,6 @@ public void SetAllPossibleTargetTypeDrawers()
             }
         }
 
-
         public void ResetIconRectProperties()
         {
             largeIconScale = Defaults.largeFolderIconScaleDefault;
@@ -331,10 +361,10 @@ public bool UseToolboxDrawers
             set => useToolboxDrawers = value;
         }
 
-        public bool ForceDefaultLists 
-        { 
-            get => forceDefaultLists; 
-            set => forceDefaultLists = value; 
+        public bool ForceDefaultLists
+        {
+            get => forceDefaultLists;
+            set => forceDefaultLists = value;
         }
 
         public List<SerializedType> DecoratorDrawerHandlers

Assets/Editor Toolbox/Editor/ToolboxEditorSettings.cs

@@ -6,7 +6,6 @@ namespace Toolbox.Editor
 {
     using Editor = UnityEditor.Editor;
 
-    [InitializeOnLoad]
     internal static class ToolboxManager
     {
         private const string settingsType = nameof(ToolboxEditorSettings);

Assets/Editor Toolbox/Editor/ToolboxManager.cs

@@ -7,6 +7,7 @@
 
 namespace Toolbox.Editor
 {
+    using Toolbox.Attributes;
     using Toolbox.Editor.Drawers;
 
     /// <summary>
@@ -83,6 +84,12 @@ internal class ToolboxPropertyHandler
         /// </summary>
         private bool hasToolboxConditionDrawer;
 
+        /// <summary>
+        /// Temporary solution to cache all attributes responsible for overriding label.
+        /// This will be replaced with validation attributes.
+        /// </summary>
+        private ILabelProcessorAttribute labelProcessorAttribute;
+
 
         /// <summary>
         /// Constructor prepares all property-related data for custom drawing.
@@ -166,19 +173,28 @@ private void CheckIfPropertyHasPropertyDrawer(Type type)
 
         private void HandleNewAttribute(PropertyAttribute attribute)
         {
-            if (!isChild)
+            //NOTE: setting tooltip and labels is valid only for parent or single properties
+            //it's a bit ugly but, it's the only semi-acceptable way to support built-in TooltipAttribute
+            //TODO: move these attributes to validation drawers
+            switch (attribute)
             {
-                //NOTE: setting tooltip and labels is valid only for parent or single properties
-                //it's a bit ugly but, it's the only semi-acceptable way to support built-in TooltipAttribute
-                switch (attribute)
-                {
-                    case TooltipAttribute a:
-                        label.tooltip = a.tooltip;
-                        return;
-                    case NewLabelAttribute a:
-                        label.text = a.NewLabel;
-                        return;
-                }
+                case TooltipAttribute a:
+                    label.tooltip = a.tooltip;
+                    return;
+                case NewLabelAttribute a:
+                    if (!isChild)
+                    {
+                        labelProcessorAttribute = a;
+                    }
+
+                    return;
+                case LabelByChildAttribute a:
+                    if (!isArray)
+                    {
+                        labelProcessorAttribute = a;
+                    }
+
+                    return;
             }
 
             var attributeType = attribute.GetType();
@@ -269,6 +285,8 @@ private bool TryAssignConditionAttribute(ToolboxConditionAttribute attribute)
 
         private void DrawProperty(SerializedProperty property, GUIContent label)
         {
+            ProcessLabel(property, label);
+
             //get toolbox drawer for the property or draw it in the default way
             if (hasToolboxPropertyDrawer && (!hasBuiltInPropertyDrawer || isArray))
             {
@@ -360,6 +378,25 @@ private PropertyCondition Validate(SerializedProperty property)
             return ToolboxDrawerModule.GetConditionDrawer(conditionAttribute)?.OnGuiValidate(property, conditionAttribute) ?? PropertyCondition.Valid;
         }
 
+        //TODO: replace this method with validation attributes
+        private void ProcessLabel(SerializedProperty property, GUIContent label)
+        {
+            if (labelProcessorAttribute == null)
+            {
+                return;
+            }
+
+            switch (labelProcessorAttribute)
+            {
+                case NewLabelAttribute a:
+                    label.text = a.NewLabel;
+                    return;
+                case LabelByChildAttribute a:
+                    PropertyUtility.OverrideLabelByChild(label, property, a.ChildName);
+                    return;
+            }
+        }
+
 
         /// <summary>
         /// Draw property using built-in layout system and cached <see cref="ToolboxAttributeDrawer"/>s.