From 2bdebdb2ef8cbd1c2a659596d49f9853c6106512 Mon Sep 17 00:00:00 2001
From: Wojtek Figat <wojtek@figat.pl>
Date: Sat, 29 May 2021 13:48:26 +0200
Subject: [PATCH] Improve Margin editing

---
 .../CustomEditors/Editors/FloatEditor.cs      |  5 +++
 .../CustomEditors/Editors/IBrushEditor.cs     |  1 +
 .../CustomEditors/Editors/MarginEditor.cs     | 35 +++++++++++++++++++
 .../Elements/IFloatValueEditor.cs             |  8 +++++
 .../CustomEditors/Elements/SliderElement.cs   |  9 +++++
 Source/Editor/GUI/Input/SliderControl.cs      | 11 ++++++
 6 files changed, 69 insertions(+)
 create mode 100644 Source/Editor/CustomEditors/Editors/MarginEditor.cs

diff --git a/Source/Editor/CustomEditors/Editors/FloatEditor.cs b/Source/Editor/CustomEditors/Editors/FloatEditor.cs
index 523db92cf..63ef35ca9 100644
--- a/Source/Editor/CustomEditors/Editors/FloatEditor.cs
+++ b/Source/Editor/CustomEditors/Editors/FloatEditor.cs
@@ -15,6 +15,11 @@ namespace FlaxEditor.CustomEditors.Editors
     {
         private IFloatValueEditor _element;
 
+        /// <summary>
+        /// Gets the element.
+        /// </summary>
+        public IFloatValueEditor Element => _element;
+
         /// <inheritdoc />
         public override DisplayStyle Style => DisplayStyle.Inline;
 
diff --git a/Source/Editor/CustomEditors/Editors/IBrushEditor.cs b/Source/Editor/CustomEditors/Editors/IBrushEditor.cs
index 8174a40a6..24f144aed 100644
--- a/Source/Editor/CustomEditors/Editors/IBrushEditor.cs
+++ b/Source/Editor/CustomEditors/Editors/IBrushEditor.cs
@@ -23,6 +23,7 @@ namespace FlaxEditor.CustomEditors.Editors
             new OptionType("Solid Color", typeof(SolidColorBrush)),
             new OptionType("Linear Gradient", typeof(LinearGradientBrush)),
             new OptionType("Texture 9-Slicing", typeof(Texture9SlicingBrush)),
+            new OptionType("Sprite 9-Slicing", typeof(Sprite9SlicingBrush)),
         };
     }
 }
diff --git a/Source/Editor/CustomEditors/Editors/MarginEditor.cs b/Source/Editor/CustomEditors/Editors/MarginEditor.cs
new file mode 100644
index 000000000..758264330
--- /dev/null
+++ b/Source/Editor/CustomEditors/Editors/MarginEditor.cs
@@ -0,0 +1,35 @@
+// Copyright (c) 2012-2021 Wojciech Figat. All rights reserved.
+
+using System.Linq;
+using FlaxEngine;
+using FlaxEngine.GUI;
+
+namespace FlaxEditor.CustomEditors.Editors
+{
+    /// <summary>
+    /// Default implementation of the inspector used to edit Version value type properties.
+    /// </summary>
+    [CustomEditor(typeof(Margin)), DefaultEditor]
+    public class MarginEditor : GenericEditor
+    {
+        /// <inheritdoc />
+        public override void Initialize(LayoutElementsContainer layout)
+        {
+            base.Initialize(layout);
+
+            var attributes = Values.GetAttributes();
+            if (attributes != null)
+            {
+                var limit = (LimitAttribute)attributes.FirstOrDefault(x => x is LimitAttribute);
+                if (limit != null)
+                {
+                    for (var i = 0; i < ChildrenEditors.Count; i++)
+                    {
+                        if (ChildrenEditors[i] is FloatEditor floatEditor)
+                            floatEditor.Element.SetLimits(limit);
+                    }
+                }
+            }
+        }
+    }
+}
diff --git a/Source/Editor/CustomEditors/Elements/IFloatValueEditor.cs b/Source/Editor/CustomEditors/Elements/IFloatValueEditor.cs
index 2e67cb5f7..59c0b7a8c 100644
--- a/Source/Editor/CustomEditors/Elements/IFloatValueEditor.cs
+++ b/Source/Editor/CustomEditors/Elements/IFloatValueEditor.cs
@@ -1,5 +1,7 @@
 // Copyright (c) 2012-2021 Wojciech Figat. All rights reserved.
 
+using FlaxEngine;
+
 namespace FlaxEditor.CustomEditors.Elements
 {
     /// <summary>
@@ -16,5 +18,11 @@ namespace FlaxEditor.CustomEditors.Elements
         /// Gets a value indicating whether user is using a slider.
         /// </summary>
         bool IsSliding { get; }
+
+        /// <summary>
+        /// Sets the editor limits from member <see cref="LimitAttribute"/>.
+        /// </summary>
+        /// <param name="limit">The limit.</param>
+        void SetLimits(LimitAttribute limit);
     }
 }
diff --git a/Source/Editor/CustomEditors/Elements/SliderElement.cs b/Source/Editor/CustomEditors/Elements/SliderElement.cs
index 6e981a257..988c86a69 100644
--- a/Source/Editor/CustomEditors/Elements/SliderElement.cs
+++ b/Source/Editor/CustomEditors/Elements/SliderElement.cs
@@ -76,5 +76,14 @@ namespace FlaxEditor.CustomEditors.Elements
 
         /// <inheritdoc cref="IFloatValueEditor.IsSliding" />
         public bool IsSliding => Slider.IsSliding;
+
+        /// <inheritdoc />
+        public void SetLimits(LimitAttribute limit)
+        {
+            if (limit != null)
+            {
+                Slider.SetLimits(limit);
+            }
+        }
     }
 }
diff --git a/Source/Editor/GUI/Input/SliderControl.cs b/Source/Editor/GUI/Input/SliderControl.cs
index 77e8a5da8..d1a2e26d1 100644
--- a/Source/Editor/GUI/Input/SliderControl.cs
+++ b/Source/Editor/GUI/Input/SliderControl.cs
@@ -410,6 +410,17 @@ namespace FlaxEditor.GUI.Input
             Value = Value;
         }
 
+        /// <summary>
+        /// Sets the limits from the attribute.
+        /// </summary>
+        /// <param name="limits">The limits.</param>
+        public void SetLimits(LimitAttribute limits)
+        {
+            _min = limits.Min;
+            _max = Mathf.Max(_min, limits.Max);
+            Value = Value;
+        }
+
         /// <summary>
         /// Updates the text of the textbox.
         /// </summary>