Rewrite custom property drawers

Author: adamgraham

Editor/AnimatorParameterPropertyDrawer.cs

@@ -12,14 +12,14 @@ public override void OnGUI(Rect position, SerializedProperty property, GUIConten
             SerializedProperty hash = property.FindPropertyRelative("m_Hash");
 
             EditorGUI.BeginProperty(position, label, property);
-            position = EditorGUI.PrefixLabel(position, GUIUtility.GetControlID(FocusType.Passive), label);
 
-            string nameValue = EditorGUI.TextField(position, name.stringValue);
+            string nameValue = EditorGUI.TextField(position, label, name.stringValue);
 
             if (nameValue != name.stringValue)
             {
                 name.stringValue = nameValue;
                 hash.intValue = Animator.StringToHash(nameValue);
+                property.serializedObject.ApplyModifiedProperties();
             }
 
             EditorGUI.EndProperty();

Editor/Timing01PropertyDrawer.cs

@@ -6,61 +6,44 @@ namespace Zigurous.Animation.Editor
     [CustomPropertyDrawer(typeof(Timing01))]
     public sealed class Timing01PropertyDrawer : PropertyDrawer
     {
+        private static readonly GUIContent startLabel = new GUIContent("Start");
+        private static readonly GUIContent endLabel = new GUIContent("End");
+
         private const float horizontalSpacing = 4f;
 
         public override void OnGUI(Rect position, SerializedProperty property, GUIContent label)
         {
-            // Start drawing the property
             EditorGUI.BeginProperty(position, label, property);
 
-            // Draw the property label
             position = EditorGUI.PrefixLabel(position, GUIUtility.GetControlID(FocusType.Passive), label);
 
-            // Store orginal sizes so they can be set back to their original values
             int originalIndent = EditorGUI.indentLevel;
             float originalLabelWidth = EditorGUIUtility.labelWidth;
 
-            // Set indent level of child fields
             EditorGUI.indentLevel = 0;
 
-            // Create references to child fields
-            SerializedProperty start = property.FindPropertyRelative("m_Start");
-            SerializedProperty end = property.FindPropertyRelative("m_End");
+            SerializedProperty m_Start = property.FindPropertyRelative("m_Start");
+            SerializedProperty m_End = property.FindPropertyRelative("m_End");
 
-            // Calculate the bounds of the child fields
-            Rect rect = new Rect(position);
-            rect.width = (position.width - horizontalSpacing) / 2f;
+            Rect field = new Rect(position);
+            field.width = (position.width - horizontalSpacing) / 2f;
 
-            // Draw the child fields
-            rect = SliderWithChangeCheck(start, rect, "Start");
-            rect = SliderWithChangeCheck(end, rect, "End");
+            field = SliderField(field, m_Start, startLabel);
+            field = SliderField(field, m_End, endLabel);
 
-            // Set sizes back to their original values
             EditorGUI.indentLevel = originalIndent;
             EditorGUIUtility.labelWidth = originalLabelWidth;
-
-            // Finish drawing the property
             EditorGUI.EndProperty();
         }
 
-        private Rect SliderWithChangeCheck(SerializedProperty property, Rect position, string displayName)
+        private Rect SliderField(Rect position, SerializedProperty property, GUIContent label)
         {
-            // Check for changes in the field's value
-            EditorGUI.BeginChangeCheck();
-
-            // Calculate the width of the field label
-            GUIContent label = new GUIContent(displayName);
             EditorGUIUtility.labelWidth = EditorStyles.label.CalcSize(label).x;
 
-            // Draw the field and store the field's value
-            float value = EditorGUI.Slider(position, label, property.floatValue, 0f, 1f);
-
-            // Update the property's value from the field
-            if (EditorGUI.EndChangeCheck()) {
-                property.floatValue = value;
-            }
+            property.serializedObject.Update();
+            property.floatValue = EditorGUI.Slider(position, label, property.floatValue, 0f, 1f);
+            property.serializedObject.ApplyModifiedProperties();
 
-            // Advance the position for the next child field
             position.x += position.width + horizontalSpacing;
             return position;
         }

Editor/TimingPropertyDrawer.cs

@@ -6,61 +6,44 @@ namespace Zigurous.Animation.Editor
     [CustomPropertyDrawer(typeof(Timing))]
     public sealed class TimingPropertyDrawer : PropertyDrawer
     {
+        private static readonly GUIContent startLabel = new GUIContent("Start");
+        private static readonly GUIContent endLabel = new GUIContent("End");
+
         private const float horizontalSpacing = 4f;
 
         public override void OnGUI(Rect position, SerializedProperty property, GUIContent label)
         {
-            // Start drawing the property
             EditorGUI.BeginProperty(position, label, property);
 
-            // Draw the property label
             position = EditorGUI.PrefixLabel(position, GUIUtility.GetControlID(FocusType.Passive), label);
 
-            // Store orginal sizes so they can be set back to their original values
             int originalIndent = EditorGUI.indentLevel;
             float originalLabelWidth = EditorGUIUtility.labelWidth;
 
-            // Set indent level of child fields
             EditorGUI.indentLevel = 0;
 
-            // Create references to child fields
-            SerializedProperty start = property.FindPropertyRelative("m_Start");
-            SerializedProperty end = property.FindPropertyRelative("m_End");
+            SerializedProperty m_Start = property.FindPropertyRelative("m_Start");
+            SerializedProperty m_End = property.FindPropertyRelative("m_End");
 
-            // Calculate the bounds of the child fields
-            Rect rect = new Rect(position);
-            rect.width = (position.width - horizontalSpacing) / 2f;
+            Rect field = new Rect(position);
+            field.width = (position.width - horizontalSpacing) / 2f;
 
-            // Draw the child fields
-            rect = FloatFieldWithChangeCheck(start, rect);
-            rect = FloatFieldWithChangeCheck(end, rect);
+            field = FloatField(field, m_Start, startLabel);
+            field = FloatField(field, m_End, endLabel);
 
-            // Set sizes back to their original values
             EditorGUI.indentLevel = originalIndent;
             EditorGUIUtility.labelWidth = originalLabelWidth;
-
-            // Finish drawing the property
             EditorGUI.EndProperty();
         }
 
-        private Rect FloatFieldWithChangeCheck(SerializedProperty property, Rect position)
+        private Rect FloatField(Rect position, SerializedProperty property, GUIContent label)
         {
-            // Check for changes in the field's value
-            EditorGUI.BeginChangeCheck();
-
-            // Calculate the width of the field label
-            GUIContent label = new GUIContent(property.displayName);
             EditorGUIUtility.labelWidth = EditorStyles.label.CalcSize(label).x;
 
-            // Draw the field and store the field's value
-            float value = EditorGUI.FloatField(position, label, property.floatValue);
-
-            // Update the property's value from the field
-            if (EditorGUI.EndChangeCheck()) {
-                property.floatValue = value;
-            }
+            property.serializedObject.Update();
+            property.floatValue = EditorGUI.FloatField(position, label, property.floatValue);
+            property.serializedObject.ApplyModifiedProperties();
 
-            // Advance the position for the next child field
             position.x += position.width + horizontalSpacing;
             return position;
         }

Editor/TimingRange01PropertyDrawer.cs

@@ -6,61 +6,44 @@ namespace Zigurous.Animation.Editor
     [CustomPropertyDrawer(typeof(TimingRange01))]
     public sealed class TimingRange01PropertyDrawer : PropertyDrawer
     {
+        private static readonly GUIContent minLabel = new GUIContent("Min");
+        private static readonly GUIContent maxLabel = new GUIContent("Max");
+
         private const float horizontalSpacing = 4f;
 
         public override void OnGUI(Rect position, SerializedProperty property, GUIContent label)
         {
-            // Start drawing the property
             EditorGUI.BeginProperty(position, label, property);
 
-            // Draw the property label
             position = EditorGUI.PrefixLabel(position, GUIUtility.GetControlID(FocusType.Passive), label);
 
-            // Store orginal sizes so they can be set back to their original values
             int originalIndent = EditorGUI.indentLevel;
             float originalLabelWidth = EditorGUIUtility.labelWidth;
 
-            // Set indent level of child fields
             EditorGUI.indentLevel = 0;
 
-            // Create references to child fields
-            SerializedProperty min = property.FindPropertyRelative("m_Min");
-            SerializedProperty max = property.FindPropertyRelative("m_Max");
+            SerializedProperty m_Min = property.FindPropertyRelative("m_Min");
+            SerializedProperty m_Max = property.FindPropertyRelative("m_Max");
 
-            // Calculate the bounds of the child fields
-            Rect rect = new Rect(position);
-            rect.width = (position.width - horizontalSpacing) / 2f;
+            Rect field = new Rect(position);
+            field.width = (position.width - horizontalSpacing) / 2f;
 
-            // Draw the child fields
-            rect = SliderWithChangeCheck(min, rect, "Min");
-            rect = SliderWithChangeCheck(max, rect, "Max");
+            field = SliderField(field, m_Min, minLabel);
+            field = SliderField(field, m_Max, maxLabel);
 
-            // Set sizes back to their original values
             EditorGUI.indentLevel = originalIndent;
             EditorGUIUtility.labelWidth = originalLabelWidth;
-
-            // Finish drawing the property
             EditorGUI.EndProperty();
         }
 
-        private Rect SliderWithChangeCheck(SerializedProperty property, Rect position, string displayName)
+        private Rect SliderField(Rect position, SerializedProperty property, GUIContent label)
         {
-            // Check for changes in the field's value
-            EditorGUI.BeginChangeCheck();
-
-            // Calculate the width of the field label
-            GUIContent label = new GUIContent(displayName);
             EditorGUIUtility.labelWidth = EditorStyles.label.CalcSize(label).x;
 
-            // Draw the field and store the field's value
-            float value = EditorGUI.Slider(position, label, property.floatValue, 0f, 1f);
-
-            // Update the property's value from the field
-            if (EditorGUI.EndChangeCheck()) {
-                property.floatValue = value;
-            }
+            property.serializedObject.Update();
+            property.floatValue = EditorGUI.Slider(position, label, property.floatValue, 0f, 1f);
+            property.serializedObject.ApplyModifiedProperties();
 
-            // Advance the position for the next child field
             position.x += position.width + horizontalSpacing;
             return position;
         }

Editor/TimingRangePropertyDrawer.cs

@@ -6,61 +6,44 @@ namespace Zigurous.Animation.Editor
     [CustomPropertyDrawer(typeof(TimingRange))]
     public sealed class TimingRangePropertyDrawer : PropertyDrawer
     {
+        private static readonly GUIContent minLabel = new GUIContent("Min");
+        private static readonly GUIContent maxLabel = new GUIContent("Max");
+
         private const float horizontalSpacing = 4f;
 
         public override void OnGUI(Rect position, SerializedProperty property, GUIContent label)
         {
-            // Start drawing the property
             EditorGUI.BeginProperty(position, label, property);
 
-            // Draw the property label
             position = EditorGUI.PrefixLabel(position, GUIUtility.GetControlID(FocusType.Passive), label);
 
-            // Store orginal sizes so they can be set back to their original values
             int originalIndent = EditorGUI.indentLevel;
             float originalLabelWidth = EditorGUIUtility.labelWidth;
 
-            // Set indent level of child fields
             EditorGUI.indentLevel = 0;
 
-            // Create references to child fields
-            SerializedProperty min = property.FindPropertyRelative("m_Min");
-            SerializedProperty max = property.FindPropertyRelative("m_Max");
+            SerializedProperty m_Min = property.FindPropertyRelative("m_Min");
+            SerializedProperty m_Max = property.FindPropertyRelative("m_Max");
 
-            // Calculate the bounds of the child fields
-            Rect rect = new Rect(position);
-            rect.width = (position.width - horizontalSpacing) / 2f;
+            Rect field = new Rect(position);
+            field.width = (position.width - horizontalSpacing) / 2f;
 
-            // Draw the child fields
-            rect = FloatFieldWithChangeCheck(min, rect);
-            rect = FloatFieldWithChangeCheck(max, rect);
+            field = FloatField(field, m_Min, minLabel);
+            field = FloatField(field, m_Max, maxLabel);
 
-            // Set sizes back to their original values
             EditorGUI.indentLevel = originalIndent;
             EditorGUIUtility.labelWidth = originalLabelWidth;
-
-            // Finish drawing the property
             EditorGUI.EndProperty();
         }
 
-        private Rect FloatFieldWithChangeCheck(SerializedProperty property, Rect position)
+        private Rect FloatField(Rect position, SerializedProperty property, GUIContent label)
         {
-            // Check for changes in the field's value
-            EditorGUI.BeginChangeCheck();
-
-            // Calculate the width of the field label
-            GUIContent label = new GUIContent(property.displayName);
             EditorGUIUtility.labelWidth = EditorStyles.label.CalcSize(label).x;
 
-            // Draw the field and store the field's value
-            float value = EditorGUI.FloatField(position, label, property.floatValue);
-
-            // Update the property's value from the field
-            if (EditorGUI.EndChangeCheck()) {
-                property.floatValue = value;
-            }
+            property.serializedObject.Update();
+            property.floatValue = EditorGUI.FloatField(position, label, property.floatValue);
+            property.serializedObject.ApplyModifiedProperties();
 
-            // Advance the position for the next child field
             position.x += position.width + horizontalSpacing;
             return position;
         }