Merge pull request #112 from arimger/develop

Develop - 0.12.12

Author: arimger

Assets/Editor Toolbox/CHANGELOG.md

@@ -1,3 +1,14 @@
+## 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:

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

@@ -41,16 +41,13 @@ protected override void OnGUISafe(Rect position, SerializedProperty property, GU
             }
         }
 
-
         public override bool IsPropertyValid(SerializedProperty property)
         {
             return property.propertyType == SerializedPropertyType.ObjectReference;
         }
 
-
         private NotNullAttribute Attribute => attribute as NotNullAttribute;
 
-
         private static class Style
         {
 #if UNITY_2019_3_OR_NEWER

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

@@ -0,0 +1,38 @@
+using UnityEditor;
+using UnityEngine;
+
+namespace Toolbox.Editor.Drawers
+{
+    [CustomPropertyDrawer(typeof(NotPrefabObjectOnlyAttribute))]
+    public class NotPrefabObjectOnlyAttributeDrawer : ObjectValidationDrawer
+    {
+        protected override string GetWarningMessage()
+        {
+            return "Assigned object can't be a Prefab.";
+        }
+
+        protected override bool IsObjectValid(Object objectValue, SerializedProperty property)
+        {
+            if (objectValue == null)
+            {
+                return false;
+            }
+
+            var attribute = Attribute;
+            if (PrefabUtility.GetPrefabAssetType(objectValue) == PrefabAssetType.NotAPrefab)
+            {
+                return true;
+            }
+
+            if (PrefabUtility.GetPrefabInstanceStatus(objectValue) == PrefabInstanceStatus.Connected &&
+                attribute.AllowInstancedPrefabs)
+            {
+                return true;
+            }
+
+            return false;
+        }
+
+        private NotPrefabObjectOnlyAttribute Attribute => attribute as NotPrefabObjectOnlyAttribute;
+    }
+}

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

@@ -34,7 +34,6 @@ protected virtual string GetWarningMessage()
 
         protected abstract bool IsObjectValid(Object objectValue, SerializedProperty property);
 
-
         public override bool IsPropertyValid(SerializedProperty property)
         {
             return property.propertyType == SerializedPropertyType.ObjectReference;

Assets/Editor Toolbox/Editor/Drawers/Regular/NotPrefabObjectOnlyAttributeDrawer.cs.meta

@@ -63,7 +63,6 @@ private void HandleTargetPicker(Rect position, SerializedProperty property)
             }
         }
 
-
         protected override float GetPropertyHeightSafe(SerializedProperty property, GUIContent label)
         {
             return SceneExists(property.stringValue)
@@ -88,13 +87,11 @@ protected override void OnGUISafe(Rect position, SerializedProperty property, GU
             HandleTargetPicker(position, property);
         }
 
-
         public override bool IsPropertyValid(SerializedProperty property)
         {
             return property.propertyType == SerializedPropertyType.String;
         }
 
-
         private static class Style
         {
             internal static readonly float rowHeight = EditorGUIUtility.singleLineHeight;

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

@@ -19,7 +19,6 @@ private GameObject GetGameObject(Object reference)
             return null;
         }
 
-
         protected override string GetWarningMessage()
         {
             return "Assigned object has to be instantiated in the Scene.";
@@ -28,7 +27,7 @@ protected override string GetWarningMessage()
         protected override bool IsObjectValid(Object objectValue, SerializedProperty property)
         {
             var gameObject = GetGameObject(objectValue);
-            return gameObject && !string.IsNullOrEmpty(gameObject.scene.name);
+            return gameObject != null && !string.IsNullOrEmpty(gameObject.scene.name);
         }
     }
 }

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

@@ -34,7 +34,6 @@ protected override void OnGUISafe(Rect position, SerializedProperty property, GU
             EditorGUI.EndProperty();
         }
 
-
         public override bool IsPropertyValid(SerializedProperty property)
         {
             return property.propertyType == SerializedPropertyType.Enum;

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

@@ -5,27 +5,40 @@ namespace Toolbox.Editor.Drawers
 {
     public class BeginGroupAttributeDrawer : ToolboxDecoratorDrawer<BeginGroupAttribute>
     {
+        private GUIStyle GetStyle(GroupStyle style)
+        {
+            switch (style)
+            {
+                default:
+                case GroupStyle.Round:
+                    return Style.roundGroupBackgroundStyle;
+                case GroupStyle.Boxed:
+                    return Style.boxedGroupBackgroundStyle;
+            }
+        }
+
         protected override void OnGuiBeginSafe(BeginGroupAttribute attribute)
         {
-            ToolboxLayoutHandler.BeginVertical(Style.groupBackgroundStyle);
+            var style = GetStyle(attribute.Style);
+            ToolboxLayoutHandler.BeginVertical(style);
             if (attribute.HasLabel)
             {
                 GUILayout.Label(attribute.Label, EditorStyles.boldLabel);
             }
         }
 
-
         private static class Style
         {
-            internal static readonly GUIStyle groupBackgroundStyle;
+            internal static readonly GUIStyle roundGroupBackgroundStyle;
+            internal static readonly GUIStyle boxedGroupBackgroundStyle;
 
             static Style()
             {
-#if UNITY_2019_3_OR_NEWER
-                groupBackgroundStyle = new GUIStyle("helpBox")
-#else
-                groupBackgroundStyle = new GUIStyle("box")
-#endif
+                roundGroupBackgroundStyle = new GUIStyle("helpBox")
+                {
+                    padding = new RectOffset(13, 12, 5, 5)
+                };
+                boxedGroupBackgroundStyle = new GUIStyle("box")
                 {
                     padding = new RectOffset(13, 12, 5, 5)
                 };