Removed need for CustomPropertyDrawers for every subclasses

azixMcAze · May 15, 2018 · 6bf53f5 · 6bf53f5
1 parent 9965306
commit 6bf53f5
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 33 deletions.
diff --git a/Assets/SerializableDictionary/Editor/SerializableDictionaryPropertyDrawer.cs b/Assets/SerializableDictionary/Editor/SerializableDictionaryPropertyDrawer.cs
@@ -5,6 +5,7 @@
 using System.Reflection;
 using System;
 
+[CustomPropertyDrawer(typeof(SerializableDictionary), true)]
 public class SerializableDictionaryPropertyDrawer : PropertyDrawer
 {
 	const string KeysFieldName = "m_keys";
@@ -549,6 +550,7 @@ static IEnumerable<EnumerationEntry> EnumerateEntries(SerializedProperty keyArra
 	}
 }
 
+[CustomPropertyDrawer(typeof(SerializableDictionary.Storage), true)]
 public class SerializableDictionaryStoragePropertyDrawer : PropertyDrawer
 {
 	public override void OnGUI(Rect position, SerializedProperty property, GUIContent label)

diff --git a/Assets/SerializableDictionary/Example/Editor/UserSerializableDictionaryPropertyDrawers.cs b/Assets/SerializableDictionary/Example/Editor/UserSerializableDictionaryPropertyDrawers.cs
diff --git a/...s/SerializableDictionary/Example/Editor/UserSerializableDictionaryPropertyDrawers.cs.meta b/...s/SerializableDictionary/Example/Editor/UserSerializableDictionaryPropertyDrawers.cs.meta
diff --git a/Assets/SerializableDictionary/SerializableDictionary.cs b/Assets/SerializableDictionary/SerializableDictionary.cs
@@ -4,7 +4,19 @@
 using System.Runtime.Serialization;
 using UnityEngine;
 
-public abstract class SerializableDictionaryBase<TKey, TValue, TValueStorage> : IDictionary<TKey, TValue>, IDictionary, ISerializationCallbackReceiver, IDeserializationCallback, ISerializable
+public abstract class SerializableDictionary
+{
+	public abstract class Storage
+	{
+	}
+
+	public class Storage<T> : Storage
+	{
+		public T data;
+	}
+}
+
+public abstract class SerializableDictionaryBase<TKey, TValue, TValueStorage> : SerializableDictionary, IDictionary<TKey, TValue>, IDictionary, ISerializationCallbackReceiver, IDeserializationCallback, ISerializable
 {
 	Dictionary<TKey, TValue> m_dict;
 	[SerializeField]
@@ -233,14 +245,6 @@ protected override void SetValue(TValue[] storage, int i, TValue value)
 	}
 }
 
-public static class SerializableDictionary
-{
-	public class Storage<T>
-	{
-		public T data;
-	}
-}
-
 public class SerializableDictionary<TKey, TValue, TValueStorage> : SerializableDictionaryBase<TKey, TValue, TValueStorage> where TValueStorage : SerializableDictionary.Storage<TValue>, new()
 {
 	public SerializableDictionary()