Fix drawing MinMaxSlider in nested classes and arrays

Author: arimger

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

@@ -3,6 +3,8 @@
 
 namespace Toolbox.Editor.Drawers
 {
+    using Toolbox.Editor.Internal;
+
     [CustomPropertyDrawer(typeof(MinMaxSliderAttribute))]
     public class MinMaxSliderAttributeDrawer : PropertyDrawerBase
     {
@@ -20,7 +22,11 @@ protected override void OnGUISafe(Rect position, SerializedProperty property, GU
 
             label = EditorGUI.BeginProperty(position, label, property);
             EditorGUI.BeginChangeCheck();
-            ToolboxEditorGui.DrawMinMaxSlider(position, label, ref xValue, ref yValue, minValue, maxValue);
+            using (new ZeroIndentScope())
+            {
+                ToolboxEditorGui.DrawMinMaxSlider(position, label, ref xValue, ref yValue, minValue, maxValue);
+            }
+
             if (EditorGUI.EndChangeCheck())
             {
                 property.vector2Value = new Vector2(xValue, yValue);

Assets/Editor Toolbox/Editor/ToolboxEditorGui.cs

@@ -205,21 +205,19 @@ public static void DrawMinMaxSlider(Rect rect, string label, ref float xValue, r
 
         public static void DrawMinMaxSlider(Rect rect, GUIContent label, ref float xValue, ref float yValue, float minValue, float maxValue)
         {
-            var padding = 8.0f;
-            var labelWidth = EditorGUIUtility.labelWidth;
+            rect = EditorGUI.PrefixLabel(rect, label);
+ 
             var fieldWidth = EditorGUIUtility.fieldWidth;
-
-            var minFieldRect = new Rect(rect.xMin + labelWidth, rect.y, fieldWidth, rect.height);
+            var minFieldRect = new Rect(rect.xMin, rect.y, fieldWidth, rect.height);
             var maxFieldRect = new Rect(rect.xMax - fieldWidth, rect.y, fieldWidth, rect.height);
-            var labelRect = new Rect(rect.x, rect.y, labelWidth, rect.height);
+
             //set slider rect between min and max fields + additional padding
-            var sliderRect = new Rect(rect.x + labelWidth + fieldWidth + padding,
-                                      rect.y,
-                                      rect.width - labelWidth - fieldWidth * 2 - padding * 2,
-                                      rect.height);
+            var spacing = 8.0f;
+            var sliderRect = Rect.MinMaxRect(minFieldRect.xMax + spacing,
+                                             rect.yMin, 
+                                             maxFieldRect.xMin - spacing, 
+                                             rect.yMax);
 
-            //begin drawing using GUI methods
-            EditorGUI.LabelField(labelRect, label);
             EditorGUI.BeginChangeCheck();
             xValue = EditorGUI.FloatField(minFieldRect, xValue);
             yValue = EditorGUI.FloatField(maxFieldRect, yValue);