Possibility to apply property condition state (disabled/hidden) to associated decorators [WIP]

Author: arimger

Assets/Editor Toolbox/Editor/ToolboxPropertyHandler.cs

@@ -293,7 +293,7 @@ private void DrawProperty(SerializedProperty property, GUIContent label)
             }
         }
 
-        private void BeginDecoratorDrawers()
+        private void BeginDecoratorDrawers(PropertyCondition conditionState = PropertyCondition.Valid)
         {
             if (!hasToolboxDecoratorDrawer)
             {
@@ -302,11 +302,33 @@ private void BeginDecoratorDrawers()
 
             for (var i = 0; i < decoratorAttributes.Count; i++)
             {
-                ToolboxDrawerModule.GetDecoratorDrawer(decoratorAttributes[i])?.OnGuiBegin(decoratorAttributes[i]);
+                var attribute = decoratorAttributes[i];
+                var drawer = ToolboxDrawerModule.GetDecoratorDrawer(attribute);
+                if (drawer == null)
+                {
+                    continue;
+                }
+
+                if (attribute.ApplyCondition)
+                {
+                    var isValid = conditionState != PropertyCondition.NonValid;
+                    var disable = conditionState == PropertyCondition.Disabled;
+                    if (isValid)
+                    {
+                        using (new EditorGUI.DisabledScope(disable))
+                        {
+                            drawer.OnGuiBegin(attribute);
+                        }
+                    }
+                }
+                else
+                {
+                    drawer.OnGuiBegin(attribute);
+                }
             }
         }
 
-        private void CloseDecoratorDrawers()
+        private void CloseDecoratorDrawers(PropertyCondition conditionState = PropertyCondition.Valid)
         {
             if (!hasToolboxDecoratorDrawer)
             {
@@ -363,11 +385,10 @@ public void OnGuiLayout(SerializedProperty property, GUIContent label)
             //using custom attributes and information about native drawers
             //we can use all associated and allowed ToolboxDrawers (for each type)
 
-            //begin all needed decorator drawers in the proper order
-            BeginDecoratorDrawers();
-
             //handle condition attribute and draw property if possible
             var conditionState = Validate(property);
+            //begin all needed decorator drawers in the proper order
+            BeginDecoratorDrawers(conditionState);
             var isValid = conditionState != PropertyCondition.NonValid;
             var disable = conditionState == PropertyCondition.Disabled;
             if (isValid)
@@ -382,7 +403,7 @@ public void OnGuiLayout(SerializedProperty property, GUIContent label)
             }
 
             //close all needed decorator drawers in the proper order
-            CloseDecoratorDrawers();
+            CloseDecoratorDrawers(conditionState);
         }
 
         /// <summary>

Assets/Examples/Scripts/SampleBehaviour4.cs

@@ -8,8 +8,9 @@ public class SampleBehaviour4 : MonoBehaviour
 {
     [Label("Help", skinStyle: SkinStyle.Box)]
 
+    [Disable]
     [Help("Very useful warning", UnityMessageType.Warning)]
-    [Help("This error example", UnityMessageType.Error)]
+    [Help("This error example", UnityMessageType.Error, ApplyCondition = true)]
     [Help("Simple information", UnityMessageType.Info)]
     public int var0;