Unit attribute improvements

Author: vanifatovvlad

Editor.Extras/Drawers/UnitDrawer.cs

@@ -1,5 +1,7 @@
 using TriInspector;
 using TriInspector.Drawers;
+using TriInspector.Resolvers;
+using TriInspector.Utilities;
 using UnityEditor;
 using UnityEngine;
 
@@ -12,34 +14,50 @@ public class UnitDrawer : TriAttributeDrawer<UnitAttribute>
         /// <summary>
         /// Defines the padding to the right of the unit label towards the editable input field
         /// </summary>
-        private const int paddingRight = 5;
-        private GUIStyle unitStyle;
-        private GUIContent content;
+        private const int PaddingRight = 5;
 
-        public override void OnGUI(Rect position, TriProperty property, TriElement next)
+        private ValueResolver<string> _unitResolver;
+
+        public override TriExtensionInitializationResult Initialize(TriPropertyDefinition propertyDefinition)
         {
-            if(unitStyle == null){
-                unitStyle = new(EditorStyles.label);
-            }
+            base.Initialize(propertyDefinition);
+
+            _unitResolver = ValueResolver.ResolveString(propertyDefinition, Attribute.unitToDisplay);
 
-            if(content == null){
-                content = new(Attribute.unitToDisplay);
+            if (_unitResolver.TryGetErrorString(out var error))
+            {
+                return error;
             }
 
-            Vector2 size = unitStyle.CalcSize(content);
+            return TriExtensionInitializationResult.Ok;
+        }
+
+        public override void OnGUI(Rect position, TriProperty property, TriElement next)
+        {
+            var unit = _unitResolver.GetValue(property, "");
+            var size = Styles.UnitStyle.CalcSize(TriGuiHelper.TempContent(unit));
 
-            var unitRect = new Rect(position.xMax - size.x - paddingRight, position.y, size.x, position.height);
+            var unitRect = new Rect(position.xMax - size.x - PaddingRight, position.y, size.x, position.height);
 
             // Render the editable input field
             next.OnGUI(position);
 
             //Change color to grey
-            var tmpColor = GUI.color;
-            GUI.color = Color.grey;
-            // Render the unit as a suffix in the unitRect
-            EditorGUI.LabelField(unitRect, content);
-            // Restore the original color
-            GUI.color = tmpColor;
+            using (TriGuiHelper.PushColor(Color.grey))
+            {
+                // Render the unit as a suffix in the unitRect
+                EditorGUI.LabelField(unitRect, unit);
+            }
+        }
+
+        private static class Styles
+        {
+            public static readonly GUIStyle UnitStyle;
+
+            static Styles()
+            {
+                UnitStyle = new GUIStyle(EditorStyles.label);
+            }
         }
     }
 }

Editor.Samples/Decorators/Decorators_UnitSample.cs

@@ -1,4 +1,5 @@
-using System.Collections.Generic;
+using System;
+using System.Globalization;
 using TriInspector;
 using UnityEngine;
 
@@ -7,6 +8,9 @@ public class Decorators_UnitSample : ScriptableObject
     [Unit("My custom Unit")]
     public float freeTextUnit;
 
+    [Unit("$" + nameof(GetDynamicUnit))]
+    public float dynamicUnit;
+
     [Unit(UnitAttribute.Meter)]
     public float lengthInMeters;
 
@@ -108,4 +112,9 @@ public class Decorators_UnitSample : ScriptableObject
 
     [Unit(UnitAttribute.MeterPerSquareSecond)]
     public float accelerationInMetersPerSquareSecond;
+
+    private string GetDynamicUnit()
+    {
+        return DateTime.Now.ToString(CultureInfo.CurrentCulture);
+    }
 }

Editor/Utilities/TriGuiHelper.cs

@@ -8,8 +8,15 @@ namespace TriInspector.Utilities
 {
     public static class TriGuiHelper
     {
+        private static readonly GUIContent TempContentShared = new GUIContent();
         private static readonly Stack<Object> TargetObjects = new Stack<Object>();
 
+        internal static GUIContent TempContent(string text)
+        {
+            TempContentShared.text = text;
+            return TempContentShared;
+        }
+        
         internal static bool IsAnyEditorPushed()
         {
             return TargetObjects.Count > 0;