New visual appearance for the SerializedDictionary; possibility to use Toolbox drawers within the SerializedDictionary properties

Author: arimger

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

@@ -46,20 +46,19 @@ static SerializedDictionaryDrawer()
                 list.drawElementCallback += (rect, index, isActive, isFocused) =>
                 {
                     var element = pairsProperty.GetArrayElementAtIndex(index);
-                    var content = list.GetElementContent(element, index);
+                    var kProperty = element.FindPropertyRelative("key");
+                    var vProperty = element.FindPropertyRelative("value");
 
-                    using (var propertyScope = new PropertyScope(element, content))
+                    var content = list.GetElementContent(element, index);
+                    using (new EditorGUILayout.HorizontalScope())
                     {
-                        if (!propertyScope.IsVisible)
-                        {
-                            return;
-                        }
-
-                        //draw key/value children and use new, shortened labels
-                        EditorGUI.indentLevel++;
-                        EditorGUILayout.PropertyField(element.FindPropertyRelative("key"), new GUIContent("K"));
-                        EditorGUILayout.PropertyField(element.FindPropertyRelative("value"), new GUIContent("V"));
-                        EditorGUI.indentLevel--;
+                        var kOption = GUILayout.Width(Style.kGroupWidth);
+                        DrawDictionaryProperty(kProperty, Style.kLabel, Style.kLabelWidth, kOption);
+
+                        var vLabel = vProperty.hasVisibleChildren
+                            ? Style.vLabel
+                            : GUIContent.none;
+                        DrawDictionaryProperty(vProperty, vLabel, Style.vLabelWidth);
                     }
                 };
                 return list;
@@ -68,6 +67,19 @@ static SerializedDictionaryDrawer()
 
         private static readonly PropertyDataStorage<ReorderableListBase, CreationArgs> storage;
 
+        private static void DrawDictionaryProperty(SerializedProperty property, GUIContent label, float labelWidth, params GUILayoutOption[] options)
+        {
+            using (new EditorGUILayout.VerticalScope(Style.propertyGroupStyle, options))
+            {
+                var indent = property.hasVisibleChildren ? 1 : 0;
+                using (new ChangeIndentScope(indent))
+                {
+                    EditorGUIUtility.labelWidth = labelWidth;
+                    ToolboxEditorGui.DrawToolboxProperty(property, label);
+                    EditorGUIUtility.labelWidth = -1;
+                }
+            }
+        }
 
         public override void OnGui(SerializedProperty property, GUIContent label)
         {
@@ -92,11 +104,19 @@ public override bool UseForChildren()
             return false;
         }
 
-
         private static class Style
         {
+            internal static readonly float kLabelWidth = 40.0f;
+            internal static readonly float kGroupWidth = 200.0f;
+            internal static readonly float vLabelWidth = 150.0f;
+
             internal static readonly float warningIconOffset = 25.0f;
             internal static readonly string warningMessage = "keys are not unique, it will break deserialization";
+
+            internal static readonly GUIContent kLabel = new GUIContent("Key");
+            internal static readonly GUIContent vLabel = new GUIContent("Value");
+
+            internal static readonly GUIStyle propertyGroupStyle = new GUIStyle(EditorStyles.helpBox);
         }
 
         private struct CreationArgs

Assets/Editor Toolbox/Editor/Internal/ChangeIndentScope.cs

@@ -0,0 +1,26 @@
+using System;
+using UnityEditor;
+
+namespace Toolbox.Editor.Internal
+{
+    internal class ChangeIndentScope : IDisposable
+    {
+        private readonly int indentChange;
+
+        public ChangeIndentScope(int indentChange)
+        {
+            this.indentChange = indentChange;
+            Prepare(indentChange);
+        }
+
+        public void Prepare(int indentChange)
+        {
+            EditorGUI.indentLevel += indentChange;
+        }
+
+        public void Dispose()
+        {
+            EditorGUI.indentLevel -= indentChange;
+        }
+    }
+}

Assets/Editor Toolbox/Editor/Internal/ChangeIndentScope.cs.meta

@@ -883,6 +883,7 @@ protected static class Style
             internal static readonly float handleHeight = 7.0f;
             internal static readonly float dragAreaWidth = 40.0f;
             internal static readonly float sizeAreaWidth = 19.0f;
+            internal static readonly float minEmptyHeight = 8.0f;
 
             internal static readonly Color selectionColor = new Color(0.3f, 0.47f, 0.75f);
 

Assets/Editor Toolbox/Editor/Internal/ReorderableListBase.cs

@@ -1304,7 +1304,7 @@ MonoBehaviour:
     buildIndex: 0
   dictionary:
     pairs:
-    - key: 0
+    - key: 2
       value: {fileID: 977748987}
     - key: 1
       value: {fileID: 2037155952}