2.0.0 preview

Editor.Extras/Drawers/AnimatorParameterAttributeDrawer.cs

@@ -6,8 +6,10 @@
 using TriInspector;
 using TriInspector.Drawers;
 using TriInspector.Resolvers;
+using TriInspector.VisualElements;
 using UnityEditor;
 using UnityEngine;
+using UnityEngine.UIElements;
 
 [assembly: RegisterTriAttributeDrawer(typeof(AnimatorParameterAttributeDrawer), TriDrawerOrder.Decorator, ApplyOnArrayElement = true)]
 
@@ -34,17 +36,20 @@ public override TriExtensionInitializationResult Initialize(TriPropertyDefinitio
 
             return TriExtensionInitializationResult.Ok;
         }
-        public override void OnGUI(Rect position, TriProperty property, TriElement next)
+        public override VisualElement CreateVisualElement(TriProperty property, VisualElement next)
+        {
+            var imgui = new IMGUIContainer(() => DrawImgui(property));
+            return new TriAlignedLabelVisualElement(property, imgui);
+        }
+
+        private void DrawImgui(TriProperty property)
         {
             var animator = _resolvedParams.AnimatorResolver.GetValue(property);
-            var label = property.DisplayNameContent;
             var (allParameters, allFilteredParameters) = AnimatorParameterHelper.GetParameters(animator, Attribute.ParameterType);
 
             if (property.ValueType == typeof(string))
             {
                 DrawPopup(
-                    position,
-                    label,
                     property,
                     animator,
                     (string)property.Value,
@@ -58,8 +63,6 @@ public override void OnGUI(Rect position, TriProperty property, TriElement next)
             else if (property.ValueType == typeof(int))
             {
                 DrawPopup(
-                    position,
-                    label,
                     property,
                     animator,
                     (int)property.Value,
@@ -72,8 +75,6 @@ public override void OnGUI(Rect position, TriProperty property, TriElement next)
             }
         }
         private void DrawPopup<T>(
-            Rect position,
-            GUIContent label,
             TriProperty property,
             Animator animator,
             T currentValue,
@@ -106,7 +107,7 @@ private void DrawPopup<T>(
             }
 
             EditorGUI.BeginChangeCheck();
-            int newIndex = EditorGUI.Popup(position, label, currentIndex, displayList.ToArray());
+            int newIndex = EditorGUILayout.Popup(currentIndex, displayList.ToArray());
 
             if (EditorGUI.EndChangeCheck())
             {

Editor.Extras/Drawers/AssetDropdownDrawer.cs

@@ -2,10 +2,11 @@
 using System.Linq;
 using TriInspector;
 using TriInspector.Drawers;
-using TriInspector.Elements;
 using TriInspector.Utilities;
+using TriInspector.VisualElements;
 using UnityEditor;
-using UnityEngine;
+using UnityEngine.UIElements;
+using Object = UnityEngine.Object;
 
 [assembly: RegisterTriAttributeDrawer(typeof(AssetDropdownDrawer<>), TriDrawerOrder.Decorator,
     ApplyOnArrayElement = true)]
@@ -14,7 +15,7 @@ namespace TriInspector.Drawers
 {
     public class AssetDropdownDrawer<T> : TriAttributeDrawer<AssetDropdownAttribute>
     {
-        private bool showNoneElement;
+        private bool _showNoneElement;
 
         public override TriExtensionInitializationResult Initialize(TriPropertyDefinition propertyDefinition)
         {
@@ -24,23 +25,25 @@ public override TriExtensionInitializationResult Initialize(TriPropertyDefinitio
                 return "AssetDropdown attribute can only be used on field with UnityEngine.Object type";
             }
 
-            showNoneElement = !propertyDefinition.Attributes.TryGet<RequiredAttribute>(out _);
+            _showNoneElement = !propertyDefinition.Attributes.TryGet<RequiredAttribute>(out _);
 
             return base.Initialize(propertyDefinition);
         }
 
-        public override TriElement CreateElement(TriProperty property, TriElement next)
+        public override VisualElement CreateVisualElement(TriProperty property, VisualElement next)
         {
-            var dropdownElement = new TriDropdownElement(property, EnumerateAssets, Attribute.Advanced);
+            var dropdownElement = new TriDropdownVisualElement(property, EnumerateAssets, Attribute.Advanced);
 
             if (Attribute.HideNextDrawer)
             {
                 return dropdownElement;
             }
 
-            var line = new TriHorizontalGroupElement();
-            line.AddChild(dropdownElement);
-            line.AddChild(base.CreateElement(property, next));
+            var line = new VisualElement();
+            line.style.flexDirection = FlexDirection.Row;
+            dropdownElement.style.flexGrow = 1;
+            line.Add(dropdownElement);
+            line.Add(next);
             return line;
         }
 
@@ -56,7 +59,7 @@ private IEnumerable<ITriDropdownItem> EnumerateAssets(TriProperty property)
                     Value = (T) (object) asset,
                 });
 
-            if (showNoneElement)
+            if (_showNoneElement)
             {
                 assets = assets.Prepend(new TriDropdownItem<T> {Text = "None", Value = default,});
             }

Editor.Extras/Drawers/BuiltinDrawerBase.cs

@@ -1,45 +1,29 @@
-using UnityEditor;
-using UnityEngine;
+using TriInspector.VisualElements;
+using UnityEngine.UIElements;
 
 namespace TriInspector.Drawers
 {
     public abstract class BuiltinDrawerBase<T> : TriValueDrawer<T>
     {
-        public sealed override TriElement CreateElement(TriValue<T> propertyValue, TriElement next)
+        public override VisualElement CreateVisualElement(TriValue<T> propertyValue, VisualElement next)
         {
             if (propertyValue.Property.TryGetSerializedProperty(out _))
             {
                 return next;
             }
 
-            return base.CreateElement(propertyValue, next);
-        }
-
-        public virtual int CompactModeLines => 1;
-        public virtual int WideModeLines => 1;
+            var field = CreateField();
+            if (field == null)
+            {
+                return next;
+            }
 
-        public sealed override float GetHeight(float width, TriValue<T> propertyValue, TriElement next)
-        {
-            var lineHeight = EditorGUIUtility.singleLineHeight;
-            var spacing = EditorGUIUtility.standardVerticalSpacing;
-            var lines = EditorGUIUtility.wideMode ? WideModeLines : CompactModeLines;
-            return lineHeight * lines + spacing * (lines - 1);
+            return TriBuiltinFieldFactory.Create(propertyValue, field);
         }
 
-        public sealed override void OnGUI(Rect position, TriValue<T> propertyValue, TriElement next)
+        protected virtual BaseField<T> CreateField()
         {
-            var value = propertyValue.SmartValue;
-
-            EditorGUI.BeginChangeCheck();
-
-            value = OnValueGUI(position, propertyValue.Property.DisplayNameContent, value);
-
-            if (EditorGUI.EndChangeCheck())
-            {
-                propertyValue.SetValue(value);
-            }
+            return null;
         }
-
-        protected abstract T OnValueGUI(Rect position, GUIContent label, T value);
     }
 }