#207 - fixed a bug where Decorator Drawers are not affected by ShowIf…

…/HideIf/EnableIf/DisableIf attributes
dbrizov · Apr 25, 2021 · 6e24ead · 6e24ead
1 parent faa02a1
commit 6e24ead
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 37 deletions.
diff --git a/Assets/NaughtyAttributes/Scripts/Editor/Utility/NaughtyEditorGUI.cs b/Assets/NaughtyAttributes/Scripts/Editor/Utility/NaughtyEditorGUI.cs
@@ -48,47 +48,33 @@ private static void PropertyField_Implementation(Rect rect, SerializedProperty p
 			}
 			else
 			{
-				GUIContent label = PropertyUtility.GetLabel(property);
-				bool anyDrawerAttribute = PropertyUtility.GetAttributes<DrawerAttribute>(property).Any();
-
-				if (!anyDrawerAttribute)
+				// Check if visible
+				bool visible = PropertyUtility.IsVisible(property);
+				if (!visible)
 				{
-					// Drawer attributes check for visibility, enableability and validator themselves,
-					// so if a property doesn't have a DrawerAttribute we need to check for these explicitly
-
-					// Check if visible
-					bool visible = PropertyUtility.IsVisible(property);
-					if (!visible)
-					{
-						return;
-					}
-
-					// Validate
-					ValidatorAttribute[] validatorAttributes = PropertyUtility.GetAttributes<ValidatorAttribute>(property);
-					foreach (var validatorAttribute in validatorAttributes)
-					{
-						validatorAttribute.GetValidator().ValidateProperty(property);
-					}
+					return;
+				}
 
-					// Check if enabled and draw
-					EditorGUI.BeginChangeCheck();
-					bool enabled = PropertyUtility.IsEnabled(property);
+				// Validate
+				ValidatorAttribute[] validatorAttributes = PropertyUtility.GetAttributes<ValidatorAttribute>(property);
+				foreach (var validatorAttribute in validatorAttributes)
+				{
+					validatorAttribute.GetValidator().ValidateProperty(property);
+				}
 
-					using (new EditorGUI.DisabledScope(disabled: !enabled))
-					{
-						propertyFieldFunction.Invoke(rect, property, label, includeChildren);
-					}
+				// Check if enabled and draw
+				EditorGUI.BeginChangeCheck();
+				bool enabled = PropertyUtility.IsEnabled(property);
 
-					// Call OnValueChanged callbacks
-					if (EditorGUI.EndChangeCheck())
-					{
-						PropertyUtility.CallOnValueChangedCallbacks(property);
-					}
+				using (new EditorGUI.DisabledScope(disabled: !enabled))
+				{
+					propertyFieldFunction.Invoke(rect, property, PropertyUtility.GetLabel(property), includeChildren);
 				}
-				else
+
+				// Call OnValueChanged callbacks
+				if (EditorGUI.EndChangeCheck())
 				{
-					// We don't need to check for enableIfAttribute
-					propertyFieldFunction.Invoke(rect, property, label, includeChildren);
+					PropertyUtility.CallOnValueChangedCallbacks(property);
 				}
 			}
 		}

diff --git a/Assets/NaughtyAttributes/Scripts/Test/_NaughtyComponent.cs b/Assets/NaughtyAttributes/Scripts/Test/_NaughtyComponent.cs
@@ -10,8 +10,6 @@ public class _NaughtyComponent : MonoBehaviour
 	[System.Serializable]
 	public class MyClass
 	{
-		[CurveRange(0, 0, 1, 1, EColor.Green)]
-		public AnimationCurve green;
 	}
 
 	[System.Serializable]