Merge branch 'develop' into feature/custom-contex-menu-controller

Author: arimger

.github/workflows/upm-dev.yml

@@ -0,0 +1,19 @@
+name: Update UPM branch (develop)
+on:
+  push:
+    branches:
+    - develop
+jobs:
+  split-upm:
+    name: split upm branch
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v2
+      with:
+        fetch-depth: 0
+    - name: split upm branch
+      run: |
+        git subtree split -P "$PKG_ROOT" -b upm-dev
+        git push -u origin upm-dev
+      env:
+        PKG_ROOT: 'Assets/Editor Toolbox'

Assets/Editor Toolbox/CHANGELOG.md

@@ -1,3 +1,116 @@
+## 0.12.13 [22.08.2024]
+
+### Changed:
+- Hierarchy: Added Tree List renderer, which improves visual identification of parent and child gameobjects
+- Hierarchy: For now 'Script' label will display all available components linked to a GameObject/Prefabs
+- Hierarchy: For now 'Layer' label will display full layer name instead of the layer mask value
+- Fix SceneView settings change events firing when they shouldn't
+- Fix issue when trying to find private fields/properties from parent classes (e.g. while using conditional attributes)
+
+### Added:
+- DisableInEditModeAttribute
+
+## 0.12.12 [17.06.2024]
+
+### Changed:
+- LabelWidthAttribute is now part of the Toolbox decorator attributes (can be mixed with other attributes)
+- Hierarchy: Script, Tag, and Layer columns are now excluded from the default settings
+- Possibility to change style for groups ([BeginGroup] and [BeginHorizontalGroup] attributes)
+- ScriptableObject Creation Wizard now accepts only ScriptableObjects marked with the [CreateInWizard] or [CreateAssetMenu] attributes
+
+### Added:
+- NotPrefabObjectOnlyAttribute
+
+## 0.12.11 [05.04.2024]
+
+### Changed:
+- Fix handling the HasNativeTypeDrawer method in Unity 2022.3.23
+- Ignore `m_SerializedDataModeController` in Toolbox wizards
+- Change [Begin/EndHorizontal] behaviour (more customization options to handle available space)
+
+## 0.12.10 [28.03.2024]
+
+### Changed:
+- Fix fetching and initializing Toolbox features when assets are updating
+- Display ReorderableList element handle at the top of available space
+- Display "Collection is Empty" label for empty ReorderableLists
+- New visual appearance for the SerializedDictionary properties
+- Fix using Toolbox drawers in the SerializedDictionary properties
+- Change the default SceneView selector key to `Tab`
+
+## 0.12.9 [27.01.2024]
+
+### Changed:
+- Fix rare invalid SerializedProperty iterator when editing child properties
+- Extend objects creation behaviour while using the ReferencePickerAttribute (possibility to create uninitialized objects)
+- Minor UX improvements in the ScriptableObjectCreationWizard
+
+## 0.12.8 [29.12.2023]
+
+### Changed:
+- Fix calling the ScriptAttributeUtility.GetDrawerTypeForType method in Unity 2033.3+
+- Fix getting and setting scripting defines in Unity 2023+
+
+## 0.12.7 [10.12.2023]
+
+### Changed:
+- Possibility to interact with ProgressBarDrawer (added IsInteractable property to the ProgressBarAttribute)
+- MinMaxAttribute now supports Vector2Int
+
+### Added:
+- 'Revert Prefab Name' option for prefabs in the GameObject/Prefabs context menu
+
+## 0.12.6 [19.10.2023]
+
+### Changed:
+- Fix ToolboxEditorToolbar in Unity 2021.1+
+- Minor API changes in the SearchablePopup class
+
+## 0.12.5 [11.09.2023]
+
+### Changed:
+- Make ToolboxEditorHandler public
+
+### Added:
+- Add public OnCacheRefreshed event to the SceneSerializationUtility
+
+## 0.12.4 [31.07.2023]
+
+### Changed:
+- Fix SceneView selection tool behaviour when selecting nested prefabs
+- Fix InvalidOperationException when ExitGUIException is thrown inside PropertyScope
+- Minor SerializedScene index calculation performance improvements
+- Fix SearchablePopup styles initialization in Unity 2022+
+- Minor visual improvements on how ReferencePicker label is rendered 
+
+## 0.12.3 [17.06.2023]
+
+### Changed:
+- Fix updating SerializedScene index after deleting Scene
+- Fix SerializedScene index calculation
+- Fix NRE when deleted Scene was still included in Build Settings
+- Fix compilation errors in Unity 2018.x
+
+### Added:
+- SceneView extension: better way to select raycasted objects in the Scene view
+- LabelWidthAttribute
+
+## 0.12.1 [12.04.2023]
+
+### Changed:
+- Fix LabelByChild usage within lists
+- Possibility to foldout/in dictionaries
+
+## 0.12.0 [10.12.2022]
+
+### Changed:
+- UX improvements for the ScriptableObjectCreationWizard
+- New API for drawing custom Editors (check HOWTO.md for more details)
+- Fix label drawing while using the [ReferencePickerAttribute]
+- Fix searching for private methods in base classes while using the [EditorButtonAttribute]
+- Fix minor issues while using conditional drawers during multi-selection
+- Fix minor issues while using the [TitleAttribute] in groups
+
 ## 0.11.9 [22.10.2022]
 
 ### Added:

Assets/Editor Toolbox/Editor/Drawers/Helpers/DrawerDataStorage.cs

@@ -7,34 +7,31 @@ namespace Toolbox.Editor.Drawers
     /// Internal system responsible for keeping and clearing data between <see cref="UnityEditor.Editor"/>s.
     /// This small system works only for attribute-based drawers and should be defined as a static field.
     /// </summary>
-    /// <typeparam name="T">Key-related object.</typeparam>
-    /// <typeparam name="T1">Data to store.</typeparam>
-    /// <typeparam name="T2">Any type needed for storage item creation. Pass <see cref="EventArgs.Empty"/> if no additional data is needed.</typeparam>
-    public abstract class DrawerDataStorage<T, T1, T2> : DrawerDataStorageBase
+    /// <typeparam name="TKey">Key-related object.</typeparam>
+    /// <typeparam name="TData">Data to store.</typeparam>
+    /// <typeparam name="TArgs">Any type needed for storage item creation. Pass <see cref="EventArgs.Empty"/> if no additional data is needed.</typeparam>
+    public abstract class DrawerDataStorage<TKey, TData, TArgs> : DrawerDataStorageBase
     {
-        protected readonly Dictionary<string, T1> items = new Dictionary<string, T1>();
+        protected readonly Dictionary<string, TData> items = new Dictionary<string, TData>();
 
-        protected readonly Func<T, T2, T1> createMethod;
-        protected readonly Action<T1> removeMethod;
+        protected readonly Func<TKey, TArgs, TData> createMethod;
+        protected readonly Action<TData> removeMethod;
 
-
-        public DrawerDataStorage(Func<T, T2, T1> createMethod) : this(createMethod, null)
+        public DrawerDataStorage(Func<TKey, TArgs, TData> createMethod) : this(createMethod, null)
         { }
 
-        public DrawerDataStorage(Func<T, T2, T1> createMethod, Action<T1> removeMethod)
+        public DrawerDataStorage(Func<TKey, TArgs, TData> createMethod, Action<TData> removeMethod)
         {
             this.createMethod = createMethod;
             this.removeMethod = removeMethod;
         }
 
-
-        protected abstract string GetKey(T context);
-
+        protected abstract string GetKey(TKey context);
 
         /// <summary>
         /// Returns and if needed creates new item.
         /// </summary>
-        public virtual T1 ReturnItem(T context, T2 args)
+        public virtual TData ReturnItem(TKey context, TArgs args)
         {
             var key = GetKey(context);
             if (items.TryGetValue(key, out var item))
@@ -47,12 +44,12 @@ public virtual T1 ReturnItem(T context, T2 args)
             }
         }
 
-        public virtual T1 CreateItem(T context, T2 args)
+        public virtual TData CreateItem(TKey context, TArgs args)
         {
             return CreateItem(context, args, true);
         }
 
-        public virtual T1 CreateItem(T context, T2 args, bool append)
+        public virtual TData CreateItem(TKey context, TArgs args, bool append)
         {
             var item = createMethod(context, args);
             if (append)
@@ -63,13 +60,13 @@ public virtual T1 CreateItem(T context, T2 args, bool append)
             return item;
         }
 
-        public virtual T1 AppendItem(T context, T1 item)
+        public virtual TData AppendItem(TKey context, TData item)
         {
             var key = GetKey(context);
             return items[key] = item;
         }
 
-        public virtual void ClearItem(T context)
+        public virtual void ClearItem(TKey context)
         {
             var key = GetKey(context);
             if (removeMethod != null)

Assets/Editor Toolbox/Editor/Drawers/Helpers/DrawerDataStorageBase.cs

@@ -1,35 +1,17 @@
-using System.Collections.Generic;
-
-namespace Toolbox.Editor.Drawers
+namespace Toolbox.Editor.Drawers
 {
     public abstract class DrawerDataStorageBase
     {
-        static DrawerDataStorageBase()
-        {
-            InspectorUtility.OnEditorReload += () =>
-            {
-                for (var i = 0; i < storages.Count; i++)
-                {
-                    storages[i].ClearItems();
-                }
-            };
-        }
-
-
         protected DrawerDataStorageBase()
         {
-            storages.Add(this);
+            DrawerStorageManager.AppendStorage(this);
         }
 
         ~DrawerDataStorageBase()
         {
-            storages.Remove(this);
+            DrawerStorageManager.RemoveStorage(this);
         }
 
-
-        private static readonly List<DrawerDataStorageBase> storages = new List<DrawerDataStorageBase>();
-
-
         /// <summary>
         /// Called each time Editor is completely destroyed.
         /// </summary>

Assets/Editor Toolbox/Editor/Drawers/Helpers/DrawerStorageManager.cs

@@ -0,0 +1,45 @@
+using System;
+using System.Collections.Generic;
+
+namespace Toolbox.Editor.Drawers
+{
+    internal static class DrawerStorageManager
+    {
+        static DrawerStorageManager()
+        {
+            ToolboxEditorHandler.OnEditorReload -= ClearStorages;
+            ToolboxEditorHandler.OnEditorReload += ClearStorages;
+        }
+
+        private static readonly List<DrawerDataStorageBase> storages = new List<DrawerDataStorageBase>();
+
+        internal static void ClearStorages()
+        {
+            ClearStorages(null);
+        }
+
+        internal static void ClearStorages(Func<DrawerDataStorageBase, bool> predicate)
+        {
+            for (var i = 0; i < storages.Count; i++)
+            {
+                var storage = storages[i];
+                if (predicate != null && !predicate(storage))
+                {
+                    continue;
+                }
+
+                storage.ClearItems();
+            }
+        }
+
+        internal static void AppendStorage(DrawerDataStorageBase storage)
+        {
+            storages.Add(storage);
+        }
+
+        internal static bool RemoveStorage(DrawerDataStorageBase storage)
+        {
+            return storages.Remove(storage);
+        }
+    }
+}

…ular/LabelByChildAttributeDrawer.cs.meta …ers/Helpers/DrawerStorageManager.cs.metaAssets/Editor Toolbox/Editor/Drawers/Regular/LabelByChildAttributeDrawer.cs.meta renamed to Assets/Editor Toolbox/Editor/Drawers/Helpers/DrawerStorageManager.cs.meta Assets/Editor Toolbox/Editor/Drawers/Regular/LabelByChildAttributeDrawer.cs.meta renamed to Assets/Editor Toolbox/Editor/Drawers/Helpers/DrawerStorageManager.cs.meta

@@ -19,7 +19,6 @@ public static class ValueExtractionHelper
             new MethodValueExtractor()
         };
 
-
         public static bool TryGetValue(string source, object declaringObject, out object value)
         {
             for (var i = 0; i < extractors.Count; i++)
@@ -73,7 +72,8 @@ public static bool TryGetValue(string source, SerializedProperty causer, out obj
             var parentObjects = new object[targetObjects.Length];
             for (var i = 0; i < targetObjects.Length; i++)
             {
-                parentObjects[i] = causer.GetDeclaringObject(targetObjects[i]);
+                var targetObject = targetObjects[i];
+                parentObjects[i] = causer.GetDeclaringObject(targetObject);
             }
 
             return TryGetValue(source, parentObjects, out value, out hasMixedValues, nextValuesComparer);