Add RunValidationIfRequired api

codewriter-packages · Mar 22, 2023 · 513a250 · 513a250
1 parent db3d602
commit 513a250
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 20 deletions.
diff --git a/Editor.Integrations/Odin/OdinFieldDrawer.cs b/Editor.Integrations/Odin/OdinFieldDrawer.cs
@@ -66,11 +66,7 @@ protected override void DrawPropertyLayout(GUIContent label)
             }
 
             _propertyTree.Update();
-
-            if (_propertyTree.ValidationRequired)
-            {
-                _propertyTree.RunValidation();
-            }
+            _propertyTree.RunValidationIfRequired();
 
             _labelOverrideContext.Label = label ?? GUIContent.none;
 

diff --git a/Editor.Integrations/Odin/OdinObjectDrawer.cs b/Editor.Integrations/Odin/OdinObjectDrawer.cs
@@ -65,11 +65,7 @@ protected override void DrawPropertyLayout(GUIContent label)
             }
 
             _propertyTree.Update();
-
-            if (_propertyTree.ValidationRequired)
-            {
-                _propertyTree.RunValidation();
-            }
+            _propertyTree.RunValidationIfRequired();
 
             using (TriGuiHelper.PushEditorTarget(ValueEntry.SmartValue))
             {

diff --git a/Editor.Samples/TriSamplesWindow.cs b/Editor.Samples/TriSamplesWindow.cs
@@ -94,11 +94,7 @@ private void DrawElement()
 
                     _currentSerializedObject.UpdateIfRequiredOrScript();
                     _currentPropertyTree.Update();
-
-                    if (_currentPropertyTree.ValidationRequired)
-                    {
-                        _currentPropertyTree.RunValidation();
-                    }
+                    _currentPropertyTree.RunValidationIfRequired();
 
                     GUILayout.Space(10);
                     GUILayout.Label("Preview", EditorStyles.boldLabel);

diff --git a/Editor/TriEditor.cs b/Editor/TriEditor.cs
@@ -53,11 +53,7 @@ public override void OnInspectorGUI()
             serializedObject.UpdateIfRequiredOrScript();
 
             _inspector.Update();
-
-            if (_inspector.ValidationRequired)
-            {
-                _inspector.RunValidation();
-            }
+            _inspector.RunValidationIfRequired();
 
             using (TriGuiHelper.PushEditorTarget(target))
             {

diff --git a/Editor/TriPropertyTree.cs b/Editor/TriPropertyTree.cs
@@ -40,6 +40,16 @@ public virtual bool ApplyChanges()
             return false;
         }
 
+        public void RunValidationIfRequired()
+        {
+            if (!ValidationRequired)
+            {
+                return;
+            }
+
+            RunValidation();
+        }
+
         public void RunValidation()
         {
             ValidationRequired = false;