Merge pull request #62 from arimger/develop

Develop - 0.12.0

Author: arimger

Assets/Editor Toolbox/CHANGELOG.md

@@ -1,3 +1,13 @@
+## 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/Extraction/ValueExtractionHelper.cs

@@ -9,7 +9,7 @@ public static class ValueExtractionHelper
     {
         private static readonly Func<object, object, bool> defaultComparer = (o1, o2) =>
         {
-            return o1.Equals(o2);
+            return o1 == o2;
         };
 
         private static readonly List<IValueExtractor> extractors = new List<IValueExtractor>()

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

@@ -10,10 +10,10 @@ public class SerializedSceneDrawer : PropertyDrawerBase
         private bool HasSceneDetails(SerializedProperty property)
         {
             var sceneProperty = property.FindPropertyRelative("sceneReference");
-            return attribute != null && sceneProperty.objectReferenceValue;
+            return attribute != null && attribute is SceneDetailsAttribute && sceneProperty.objectReferenceValue;
         }
 
-        private void DrawIncludedSceneDetails(Rect position, SceneData sceneData)
+        private void DrawSceneDetails(Rect position, SceneData sceneData)
         {
             EditorGUI.BeginDisabledGroup(true);
             var spacing = EditorGUIUtility.standardVerticalSpacing;
@@ -23,19 +23,6 @@ private void DrawIncludedSceneDetails(Rect position, SceneData sceneData)
             EditorGUI.EndDisabledGroup();
         }
 
-        private void DrawRejectedSceneDetails(Rect position, SceneData sceneData)
-        {
-            EditorGUI.BeginDisabledGroup(true);
-            var spacing = EditorGUIUtility.standardVerticalSpacing;
-            EditorGUI.LabelField(position, Style.notInBuildContent);
-            position.y += EditorGUIUtility.singleLineHeight + spacing;
-            EditorGUI.EndDisabledGroup();
-            if (GUI.Button(position, Style.showDetailsContent))
-            {
-                OpenBuildSettings();
-            }
-        }
-
         private void OpenBuildSettings()
         {
             EditorWindow.GetWindow(typeof(BuildPlayerWindow));
@@ -69,11 +56,18 @@ protected override void OnGUISafe(Rect position, SerializedProperty property, GU
             position.y += EditorGUIUtility.singleLineHeight + spacing;
             if (sceneData.inBuild)
             {
-                DrawIncludedSceneDetails(position, sceneData);
+                DrawSceneDetails(position, sceneData);
             }
             else
             {
-                DrawRejectedSceneDetails(position, sceneData);
+                EditorGUI.BeginDisabledGroup(true);
+                EditorGUI.LabelField(position, Style.notInBuildContent);
+                position.y += EditorGUIUtility.singleLineHeight + spacing;
+                EditorGUI.EndDisabledGroup();
+                if (GUI.Button(position, Style.showDetailsContent))
+                {
+                    OpenBuildSettings();
+                }
             }
         }
 

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

@@ -7,7 +7,7 @@ public class BeginGroupAttributeDrawer : ToolboxDecoratorDrawer<BeginGroupAttrib
     {
         protected override void OnGuiBeginSafe(BeginGroupAttribute attribute)
         {
-            ToolboxLayoutHelper.BeginVertical(Style.groupBackgroundStyle);
+            ToolboxLayoutHandler.BeginVertical(Style.groupBackgroundStyle);
             if (attribute.HasLabel)
             {
                 GUILayout.Label(attribute.Label, EditorStyles.boldLabel);

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

@@ -13,7 +13,7 @@ protected override void OnGuiBeginSafe(BeginHorizontalAttribute attribute)
             EditorGUIUtility.fieldWidth = width * attribute.FieldToWidthRatio;
 
             //begin horizontal group using internal utility
-            ToolboxLayoutHelper.BeginHorizontal();
+            ToolboxLayoutHandler.BeginHorizontal();
         }
     }
 }

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

@@ -37,14 +37,14 @@ protected override void OnGuiBeginSafe(BeginHorizontalGroupAttribute attribute)
             EditorGUIUtility.labelWidth = fixedWidth * attribute.LabelToWidthRatio;
             EditorGUIUtility.fieldWidth = fixedWidth * attribute.FieldToWidthRatio;
 
-            ToolboxLayoutHelper.BeginVertical(Style.groupBackgroundStyle);
+            ToolboxLayoutHandler.BeginVertical(Style.groupBackgroundStyle);
             if (attribute.HasLabel)
             {
                 GUILayout.Label(attribute.Label, EditorStyles.boldLabel);
             }
 
             HandleScrollView(fixedHeight);
-            ToolboxLayoutHelper.BeginHorizontal();
+            ToolboxLayoutHandler.BeginHorizontal();
         }
 
 

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

@@ -6,7 +6,7 @@ public class BeginVerticalAttributeDrawer : ToolboxDecoratorDrawer<BeginVertical
     {
         protected override void OnGuiBeginSafe(BeginVerticalAttribute attribute)
         {
-            ToolboxLayoutHelper.BeginVertical();
+            ToolboxLayoutHandler.BeginVertical();
         }
     }
 }

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

@@ -6,7 +6,7 @@ public class EndGroupAttributeDrawer : ToolboxDecoratorDrawer<EndGroupAttribute>
     {
         protected override void OnGuiCloseSafe(EndGroupAttribute attribute)
         {
-            ToolboxLayoutHelper.CloseVertical();
+            ToolboxLayoutHandler.CloseVertical();
         }
     }
 }

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

@@ -8,7 +8,7 @@ public class EndHorizontalAttributeDrawer : ToolboxDecoratorDrawer<EndHorizontal
         protected override void OnGuiCloseSafe(EndHorizontalAttribute attribute)
         {
             //end horizontal group
-            ToolboxLayoutHelper.CloseHorizontal();
+            ToolboxLayoutHandler.CloseHorizontal();
 
             //restore label & field 
             EditorGUIUtility.labelWidth = 0.0f;

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

@@ -7,9 +7,9 @@ public class EndHorizontalGroupAttributeDrawer : ToolboxDecoratorDrawer<EndHoriz
     {
         protected override void OnGuiCloseSafe(EndHorizontalGroupAttribute attribute)
         {
-            ToolboxLayoutHelper.CloseHorizontal();
+            ToolboxLayoutHandler.CloseHorizontal();
             EditorGUILayout.EndScrollView();
-            ToolboxLayoutHelper.CloseVertical();
+            ToolboxLayoutHandler.CloseVertical();
 
             EditorGUIUtility.labelWidth = 0.0f;
             EditorGUIUtility.fieldWidth = 0.0f;