Fix TooltipAttribute not working and expose TriEditor.OnEnable and Tr…

…iEditor.OnDisable (#144)
codewriter-packages · Nov 6, 2023 · 7eb8291 · 7eb8291
1 parent e825652
commit 7eb8291
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 4 deletions.
diff --git a/Editor/Editors/TriEditor.cs b/Editor/Editors/TriEditor.cs
@@ -7,12 +7,12 @@ public abstract class TriEditor : Editor
     {
         private TriEditorCore _core;
 
-        private void OnEnable()
+        protected virtual void OnEnable()
         {
             _core = new TriEditorCore(this);
         }
 
-        private void OnDisable()
+        protected virtual void OnDisable()
         {
             _core.Dispose();
         }

diff --git a/Editor/Elements/TriLabelElement.cs b/Editor/Elements/TriLabelElement.cs
@@ -6,9 +6,14 @@ public class TriLabelElement : TriElement
     {
         private readonly GUIContent _label;
 
-        public TriLabelElement(string label)
+        public TriLabelElement(string label, string tooltip = "")
         {
-            _label = new GUIContent(label);
+            _label = new GUIContent(label, tooltip);
+        }
+
+        public TriLabelElement(GUIContent label)
+        {
+            _label = label;
         }
 
         public override float GetHeight(float width)

diff --git a/Editor/TriPropertyDefinition.cs b/Editor/TriPropertyDefinition.cs
@@ -102,6 +102,10 @@ internal TriPropertyDefinition(
             {
                 CustomTooltip = ValueResolver.ResolveString(this, tooltipAttribute.Tooltip);
             }
+            else if (Attributes.TryGet(out TooltipAttribute unityTooltipAttribute))
+            {
+                CustomTooltip = new ConstantValueResolver<string>(unityTooltipAttribute.tooltip);
+            }
         }
 
         public Type OwnerType { get; }