Fix displaying MinMax sliders in indented rects; support for Vector2Int in the MinMaxSliderAttribute

Author: arimger

Assets/Editor Toolbox/Editor/Drawers/Regular/MinMaxSliderAttributeDrawer.cs

@@ -10,26 +10,49 @@ public class MinMaxSliderAttributeDrawer : PropertyDrawerBase
     {
         protected override float GetPropertyHeightSafe(SerializedProperty property, GUIContent label)
         {
-            return base.GetPropertyHeightSafe(property, label);
+            return EditorGUIUtility.singleLineHeight;
         }
 
         protected override void OnGUISafe(Rect position, SerializedProperty property, GUIContent label)
         {
             var minValue = Attribute.MinValue;
             var maxValue = Attribute.MaxValue;
-            var xValue = property.vector2Value.x;
-            var yValue = property.vector2Value.y;
+
+            var xValue = 0.0f;
+            var yValue = 0.0f;
+            switch (property.propertyType)
+            {
+                case SerializedPropertyType.Vector2:
+                    xValue = property.vector2Value.x;
+                    yValue = property.vector2Value.y;
+                    break;
+                case SerializedPropertyType.Vector2Int:
+                    xValue = property.vector2IntValue.x;
+                    yValue = property.vector2IntValue.y;
+                    break;
+            }
 
             label = EditorGUI.BeginProperty(position, label, property);
             EditorGUI.BeginChangeCheck();
+            position = EditorGUI.PrefixLabel(position, label);
             using (new ZeroIndentScope())
             {
-                ToolboxEditorGui.DrawMinMaxSlider(position, label, ref xValue, ref yValue, minValue, maxValue);
+                ToolboxEditorGui.DrawMinMaxSlider(position, ref xValue, ref yValue, minValue, maxValue);
             }
 
             if (EditorGUI.EndChangeCheck())
             {
-                property.vector2Value = new Vector2(xValue, yValue);
+                switch (property.propertyType)
+                {
+                    case SerializedPropertyType.Vector2:
+                        property.vector2Value = new Vector2(xValue, yValue);
+                        break;
+                    case SerializedPropertyType.Vector2Int:
+                        var intXValue = Mathf.RoundToInt(xValue);
+                        var intYValue = Mathf.RoundToInt(yValue);
+                        property.vector2IntValue = new Vector2Int(intXValue, intYValue);
+                        break;
+                }
             }
 
             EditorGUI.EndProperty();
@@ -38,7 +61,8 @@ protected override void OnGUISafe(Rect position, SerializedProperty property, GU
 
         public override bool IsPropertyValid(SerializedProperty property)
         {
-            return property.propertyType == SerializedPropertyType.Vector2;
+            return property.propertyType == SerializedPropertyType.Vector2 ||
+                property.propertyType == SerializedPropertyType.Vector2Int;
         }
 
 

Assets/Editor Toolbox/Editor/Drawers/Toolbox/PropertySelf/DynamicMinMaxSliderAttributeDrawer.cs

@@ -1,20 +1,49 @@
-using UnityEditor;
+using UnityEditor;
 using UnityEngine;
 
 namespace Toolbox.Editor.Drawers
 {
+    using Toolbox.Editor.Internal;
+
     public class DynamicMinMaxSliderAttributeDrawer : DynamicMinMaxBaseDrawer<DynamicMinMaxSliderAttribute>
     {
         protected override void OnGuiSafe(SerializedProperty property, GUIContent label, float minValue, float maxValue)
         {
-            var xValue = property.vector2Value.x;
-            var yValue = property.vector2Value.y;
+            var xValue = 0.0f;
+            var yValue = 0.0f;
+            switch (property.propertyType)
+            {
+                case SerializedPropertyType.Vector2:
+                    xValue = property.vector2Value.x;
+                    yValue = property.vector2Value.y;
+                    break;
+                case SerializedPropertyType.Vector2Int:
+                    xValue = property.vector2IntValue.x;
+                    yValue = property.vector2IntValue.y;
+                    break;
+            }
+
             ToolboxEditorGui.BeginProperty(property, ref label, out var position);
+            position = EditorGUI.PrefixLabel(position, label);
             EditorGUI.BeginChangeCheck();
-            ToolboxEditorGui.DrawMinMaxSlider(position, label, ref xValue, ref yValue, minValue, maxValue);
+            using (new ZeroIndentScope())
+            {
+                ToolboxEditorGui.DrawMinMaxSlider(position, ref xValue, ref yValue, minValue, maxValue);
+            }
+
             if (EditorGUI.EndChangeCheck())
             {
-                property.vector2Value = new Vector2(xValue, yValue);
+                switch (property.propertyType)
+                {
+                    case SerializedPropertyType.Vector2:
+                        property.vector2Value = new Vector2(xValue, yValue);
+                        break;
+                    case SerializedPropertyType.Vector2Int:
+                        var intXValue = Mathf.RoundToInt(xValue);
+                        var intYValue = Mathf.RoundToInt(yValue);
+                        property.vector2IntValue = new Vector2Int(intXValue, intYValue);
+                        break;
+                }
             }
 
             ToolboxEditorGui.CloseProperty();
@@ -23,7 +52,8 @@ protected override void OnGuiSafe(SerializedProperty property, GUIContent label,
 
         public override bool IsPropertyValid(SerializedProperty property)
         {
-            return property.propertyType == SerializedPropertyType.Vector2;
+            return property.propertyType == SerializedPropertyType.Vector2 || 
+                property.propertyType == SerializedPropertyType.Vector2Int;
         }
     }
 }

Assets/Editor Toolbox/Editor/ToolboxEditorGui.cs

@@ -199,21 +199,14 @@ public static void DrawTexture(Rect rect, Texture texture, ScaleMode scaleMode,
             GUI.DrawTexture(rect, texture, scaleMode, alphaBlend);
         }
 
-        public static void DrawMinMaxSlider(Rect rect, string label, ref float xValue, ref float yValue, float minValue, float maxValue)
+        public static void DrawMinMaxSlider(Rect rect, ref float xValue, ref float yValue, float minValue, float maxValue)
         {
-            DrawMinMaxSlider(rect, new GUIContent(label), ref xValue, ref yValue, minValue, maxValue);
-        }
-
-        public static void DrawMinMaxSlider(Rect rect, GUIContent label, ref float xValue, ref float yValue, float minValue, float maxValue)
-        {
-            rect = EditorGUI.PrefixLabel(rect, label);
-
             var fieldWidth = EditorGUIUtility.fieldWidth;
             var minFieldRect = new Rect(rect.xMin, rect.y, fieldWidth, rect.height);
             var maxFieldRect = new Rect(rect.xMax - fieldWidth, rect.y, fieldWidth, rect.height);
 
             //set slider rect between min and max fields + additional padding
-            var spacing = 8.0f;
+            const float spacing = 8.0f;
             var sliderRect = Rect.MinMaxRect(minFieldRect.xMax + spacing,
                                              rect.yMin,
                                              maxFieldRect.xMin - spacing,
@@ -229,6 +222,17 @@ public static void DrawMinMaxSlider(Rect rect, GUIContent label, ref float xValu
             yValue = Mathf.Clamp(yValue, Mathf.Max(minValue, xValue), maxValue);
         }
 
+        public static void DrawMinMaxSlider(Rect rect, string label, ref float xValue, ref float yValue, float minValue, float maxValue)
+        {
+            DrawMinMaxSlider(rect, new GUIContent(label), ref xValue, ref yValue, minValue, maxValue);
+        }
+
+        public static void DrawMinMaxSlider(Rect rect, GUIContent label, ref float xValue, ref float yValue, float minValue, float maxValue)
+        {
+            rect = EditorGUI.PrefixLabel(rect, label);
+            DrawMinMaxSlider(rect, ref xValue, ref yValue, minValue, maxValue);
+        }
+
         public static void BoldLabel(Rect rect, string label)
         {
             BoldLabel(rect, new GUIContent(label));

Assets/Examples/Scenes/SampleScene.unity

@@ -1009,7 +1009,8 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   targetTag: Untagged
   progressBar: 25.4
-  var2: {x: 30.418846, y: 60.78535}
+  minMaxVector: {x: 0, y: 0}
+  minMaxVectorInt: {x: 0, y: 0}
   var8: {fileID: 977748987}
   preview: {fileID: 5059060190599569102, guid: 5573ca52cac7c2d4cb2536e37e9be1f1, type: 3}
   var10: 2.16
@@ -1027,6 +1028,7 @@ MonoBehaviour:
   prefabReference: {fileID: 0}
   bigNumber: 12345678
   currency: 20.41
+  veryVeryVeryVeryVeryLongName: 0
 --- !u!4 &959025299
 Transform:
   m_ObjectHideFlags: 2

Assets/Examples/Scripts/SampleBehaviour1.cs

@@ -17,7 +17,9 @@ public class SampleBehaviour1 : MonoBehaviour
     [Label("MinMax Slider", skinStyle: SkinStyle.Box)]
 
     [MinMaxSlider(10.0f, 100.0f)]
-    public Vector2 var2;
+    public Vector2 minMaxVector;
+    [MinMaxSlider(1, 8)]
+    public Vector2Int minMaxVectorInt;
 
     [Label("Asset Preview", skinStyle: SkinStyle.Box)]