Tri inspector (#2)

Replace drawers with Tri Inspector
codewriter-packages · Jun 30, 2023 · b63cf34 · b63cf34
1 parent 97b0eb5
commit b63cf34
Show file tree

Hide file tree

Showing 50 changed files with 325 additions and 422 deletions.
diff --git a/Editor/Adapters.meta b/Editor/Adapters.meta
diff --git a/Editor/Adapters/FloatFormatAdapterEditor.cs b/Editor/Adapters/FloatFormatAdapterEditor.cs
diff --git a/Editor/Adapters/FloatFormatAdapterEditor.cs.meta b/Editor/Adapters/FloatFormatAdapterEditor.cs.meta
diff --git a/Editor/Adapters/TextLocalizeAdapterEditor.cs b/Editor/Adapters/TextLocalizeAdapterEditor.cs
diff --git a/Editor/Adapters/TextLocalizeAdapterEditor.cs.meta b/Editor/Adapters/TextLocalizeAdapterEditor.cs.meta
diff --git a/Editor/Applicators.meta b/Editor/Applicators.meta
diff --git a/Editor/Applicators/FormattedTMPTextApplicatorEditor.cs b/Editor/Applicators/FormattedTMPTextApplicatorEditor.cs
diff --git a/Editor/Applicators/FormattedTMPTextApplicatorEditor.cs.meta b/Editor/Applicators/FormattedTMPTextApplicatorEditor.cs.meta
diff --git a/Editor/Applicators/LocalizedTMPTextApplicatorEditor.cs b/Editor/Applicators/LocalizedTMPTextApplicatorEditor.cs
diff --git a/Editor/Applicators/LocalizedTMPTextApplicatorEditor.cs.meta b/Editor/Applicators/LocalizedTMPTextApplicatorEditor.cs.meta
diff --git a/Editor/CodeWriter.ViewBinding.Editor.asmdef b/Editor/CodeWriter.ViewBinding.Editor.asmdef
@@ -1,15 +1,18 @@
 {
     "name": "CodeWriter.ViewBinding.Editor",
+    "rootNamespace": "",
     "references": [
         "CodeWriter.ViewBinding",
-        "CodeWriter.ViewBinding.Applicators"
+        "CodeWriter.ViewBinding.Applicators",
+        "TriInspector",
+        "TriInspector.Editor"
     ],
     "includePlatforms": [
         "Editor"
     ],
     "excludePlatforms": [],
     "allowUnsafeCode": false,
-    "overrideReferences": false,
+    "overrideReferences": true,
     "precompiledReferences": [],
     "autoReferenced": true,
     "defineConstraints": [],

diff --git a/Editor/Odin.meta b/Editor/Odin.meta
diff --git a/Editor/Odin/CodeWriter.ViewBinding.Editor.Odin.asmdef b/Editor/Odin/CodeWriter.ViewBinding.Editor.Odin.asmdef
@@ -0,0 +1,21 @@
+{
+    "name": "CodeWriter.ViewBinding.Editor.Odin",
+    "rootNamespace": "",
+    "references": [
+        "CodeWriter.ViewBinding",
+        "TriInspector.Editor.Integrations.Odin"
+    ],
+    "includePlatforms": [
+        "Editor"
+    ],
+    "excludePlatforms": [],
+    "allowUnsafeCode": false,
+    "overrideReferences": false,
+    "precompiledReferences": [],
+    "autoReferenced": true,
+    "defineConstraints": [
+        "ODIN_INSPECTOR"
+    ],
+    "versionDefines": [],
+    "noEngineReferences": false
+}
diff --git a/Editor/Odin/CodeWriter.ViewBinding.Editor.Odin.asmdef.meta b/Editor/Odin/CodeWriter.ViewBinding.Editor.Odin.asmdef.meta
diff --git a/Editor/Odin/OdinViewEntryValidator.cs b/Editor/Odin/OdinViewEntryValidator.cs
@@ -1,7 +1,7 @@
-#if ODIN_INSPECTOR
-
-using CodeWriter.ViewBinding.Editor.Odin;
+using CodeWriter.ViewBinding.Editor.Odin;
+using Sirenix.OdinInspector.Editor;
 using Sirenix.OdinInspector.Editor.Validation;
+using TriInspector.Editor.Integrations.Odin;
 
 [assembly: RegisterValidator(typeof(OdinViewEntryValidator<>))]
 
@@ -11,6 +11,16 @@ public class OdinViewEntryValidator<TViewEntry> : ValueValidator<TViewEntry>
         where TViewEntry : ViewEntry
     {
 #if ODIN_INSPECTOR_3_1
+        public override bool CanValidateProperty(InspectorProperty property)
+        {
+            if (TriOdinUtility.IsDrawnByTri(property.Tree.TargetType))
+            {
+                return false;
+            }
+
+            return base.CanValidateProperty(property);
+        }
+
         protected override void Validate(ValidationResult result)
         {
             ValidateInternal(ValueEntry.SmartValue, result);
@@ -34,6 +44,4 @@ private void ValidateInternal(TViewEntry value, ValidationResult result)
             result.ResultType = ValidationResultType.Error;
         }
     }
-}
-
-#endif
+}
diff --git a/Editor/Odin/OdinViewEntryValidator.cs.meta b/Editor/Odin/OdinViewEntryValidator.cs.meta
diff --git a/Editor/SingleResultAdapterBaseEditor.cs b/Editor/SingleResultAdapterBaseEditor.cs
diff --git a/Editor/SingleResultAdapterBaseEditor.cs.meta b/Editor/SingleResultAdapterBaseEditor.cs.meta
diff --git a/Editor/Styles.cs b/Editor/Styles.cs
@@ -5,6 +5,8 @@ namespace CodeWriter.ViewBinding.Editor
 {
     internal static class Styles
     {
+        public static readonly GUIContent NoneContent = GUIContent.none;
+
         public static readonly GUIStyle RedBoldLabel;
 
         static Styles()