Start simplifying ValueFactory

src/UI/ValueFactory.cs

@@ -17,141 +17,39 @@ internal static bool GetNewValue(string propertyName, Design design, Type type,
 
             if (type.IsGenericType && type.GetGenericTypeDefinition() == typeof(SliderOption<>))
             {
-                var designer = new SliderOptionEditor(type.GetGenericArguments()[0], oldValue);
-                Application.Run(designer);
-
-                if (!designer.Cancelled)
-                {
-                    newValue = designer.Result;
-                    return true;
-                }
-                else
-                {
-                    // user canceled designing the Option
-                    return false;
-                }
+                return RunEditor(new SliderOptionEditor(type.GetGenericArguments()[0], oldValue), out newValue);
             }
-            else
-            if (type== typeof(ColorScheme))
+            else if (type == typeof(ColorScheme))
             {
                 return GetNewColorSchemeValue(design, out newValue);
             }
-            else
-            if (type == typeof(Attribute) ||
-                type == typeof(Attribute?))
+            else if (type == typeof(Attribute) || type == typeof(Attribute?))
             {
-                // if its an Attribute or nullableAttribute
-                var picker = new ColorPicker((Attribute?)oldValue);
-                Application.Run(picker);
-
-                if (!picker.Cancelled)
-                {
-                    newValue = picker.Result;
-                    return true;
-                }
-                else
-                {
-                    // user cancelled designing the Color
-                    newValue = null;
-                    return false;
-                }
+                return RunEditor(new ColorPicker((Attribute?)oldValue), out newValue);
             }
-            else
-            if (type== typeof(ITextValidateProvider))
+            else if (type == typeof(Pos))
             {
-                string? oldPattern = oldValue is TextRegexProvider r ? (string?)r.Pattern.ToPrimitive() : null;
-                if (Modals.GetString("New Validation Pattern", "Regex Pattern", oldPattern, out var newPattern))
-                {
-                    newValue = string.IsNullOrWhiteSpace(newPattern) ? null : new TextRegexProvider(newPattern);
-                    return true;
-                }
-
-                // user cancelled entering a pattern
-                newValue = null;
-                return false;
+                return RunEditor(new PosEditor(design, (Pos)oldValue ?? throw new Exception("Pos property was unexpectedly null")), out newValue);
             }
-            else
-            if (type== typeof(Pos))
+            else if (type == typeof(Size))
             {
-                // user is editing a Pos
-                var designer = new PosEditor(design, (Pos)oldValue?? throw new Exception("Pos property was unexpectedly null"));
-
-                Application.Run(designer);
-
-                if (!designer.Cancelled)
-                {
-                    newValue = designer.Result;
-                    return true;
-                }
-                else
-                {
-                    // user cancelled designing the Pos
-                    newValue = null;
-                    return false;
-                }
+                return RunEditor(new SizeEditor((Size)(oldValue ?? throw new Exception($"Property {propertyName} is of Type Size but its current value is null"))), out newValue);
             }
-            else
-            if (type== typeof(Size))
+            else if (type == typeof(PointF))
             {
-                // user is editing a Size
-                var oldSize = (Size)(oldValue ?? throw new Exception($"Property {propertyName} is of Type Size but it's current value is null"));
-                var designer = new SizeEditor(oldSize);
-
-                Application.Run(designer);
-
-                if (!designer.Cancelled)
-                {
-                    newValue = designer.Result;
-                    return true;
-                }
-                else
-                {
-                    // user cancelled designing the Pos
-                    newValue = null;
-                    return false;
-                }
+                var oldPointF = (PointF)(oldValue ?? throw new Exception($"Property {propertyName} is of Type PointF but its current value is null"));
+                return RunEditor(new PointEditor(oldPointF.X, oldPointF.Y), out newValue);
             }
-            else
-            if (type== typeof(PointF))
+            else if (type == typeof(Dim))
             {
-                // user is editing a PointF
-                var oldPointF = (PointF)(oldValue ?? throw new Exception($"Property {propertyName} is of Type PointF but it's current value is null"));
-                var designer = new PointEditor(oldPointF.X, oldPointF.Y);
-
-                Application.Run(designer);
-
-                if (!designer.Cancelled)
-                {
-                    newValue = new PointF(designer.ResultX, designer.ResultY);
-                    return true;
-                }
-                else
-                {
-                    // user cancelled designing the Pos
-                    newValue = null;
-                    return false;
-                }
+                return RunEditor(new DimEditor(design, (Dim)oldValue), out newValue);
             }
-            else
-            if (type== typeof(Dim))
+            else if (type == typeof(bool))
             {
-                // user is editing a Dim
-                var designer = new DimEditor(design, (Dim)oldValue);
-                Application.Run(designer);
-
-                if (!designer.Cancelled)
-                {
-                    newValue = designer.Result;
-                    return true;
-                }
-                else
-                {
-                    // user cancelled designing the Dim
-                    newValue = null;
-                    return false;
-                }
+                int answer = ChoicesDialog.Query(propertyName, $"New value for {type}", "Yes", "No");
+                newValue = answer == 0 ? true : false;
+                return answer != -1;
             }
-            else
             if (type== typeof(bool))
             {
                 int answer = ChoicesDialog.Query(propertyName, $"New value for {type}", "Yes", "No");
@@ -316,6 +214,20 @@ internal static bool GetNewValue(string propertyName, Design design, Type type,
             newValue = null;
             return false;
         }
+
+        private static bool RunEditor<T>(T editor, out object? result) where T : Dialog, IValueGetterDialog
+        {
+            Application.Run(editor);
+            if (editor.Cancelled)
+            {
+                result = null;
+                return false;
+            }
+
+            result = editor.Result;
+            return true;
+        }
+
         internal static bool GetNewValue(Design design, Property property, object? oldValue, out object? newValue)
         {
             if (property is InstanceOfProperty inst)

src/UI/Windows/ColorPicker.cs

@@ -15,12 +15,12 @@ namespace TerminalGuiDesigner.UI.Windows;
 /// <summary>
 /// Prompts user to pick a two <see cref="Color"/> to make an <see cref="Attribute"/>.
 /// </summary>
-public partial class ColorPicker
+public partial class ColorPicker : IValueGetterDialog
 {
     /// <summary>
     /// The combination of foreground and background <see cref="Color"/> the user chose.
     /// </summary>
-    public Terminal.Gui.Attribute? Result { get; internal set; }
+    public object Result { get; internal set; }
 
     /// <summary>
     /// True if user closed dialog with cancel.

src/UI/Windows/ColorSchemeEditor.cs

@@ -115,10 +115,10 @@ private MutableColorScheme Clone(ColorScheme scheme)
 
     private Terminal.Gui.Attribute PickNewColorsFor(Terminal.Gui.Attribute current)
     {
-        var pick = new ColorPicker(current);
+        var pick = new Windows.ColorPicker(current);
         Application.Run(pick);
 
-        return pick.Cancelled ? current : pick.Result ?? current;
+        return pick.Cancelled ? current : (Attribute?)pick.Result ?? current;
     }
 
     private void SetColorPatches()

src/UI/Windows/DimEditor.cs

@@ -7,6 +7,8 @@
 // </auto-generated>
 //------------------------------------------------------------------------------
 
+using JetBrains.Annotations;
+
 namespace TerminalGuiDesigner.UI.Windows;
 
 using Terminal.Gui;
@@ -16,15 +18,16 @@ namespace TerminalGuiDesigner.UI.Windows;
 /// <summary>
 /// Editor for the <see cref="Dim"/> class.
 /// </summary>
-public partial class DimEditor : Dialog
+public partial class DimEditor : Dialog, IValueGetterDialog
 {
     private Design design;
 
     /// <summary>
     /// The final <see cref="Dim"/> value user has configured based on
     /// radio buttons and text box values.
     /// </summary>
-    public Dim Result { get; private set; }
+    [CanBeNull]
+    public object Result { get; private set; }
 
     /// <summary>
     /// True if dialog was canceled.

src/UI/Windows/IValueGetterDialog.cs

@@ -0,0 +1,8 @@
+#nullable disable
+namespace TerminalGuiDesigner.UI.Windows;
+
+public interface IValueGetterDialog
+{
+    public object? Result { get; }
+    public bool Cancelled { get; }
+}

src/UI/Windows/PointEditor.cs

@@ -7,14 +7,17 @@
 // </auto-generated>
 //------------------------------------------------------------------------------
 
+using JetBrains.Annotations;
+using TerminalGuiDesigner.UI.Windows;
+
 namespace TerminalGuiDesigner; 
 using System;
 using Terminal.Gui;
 
 /// <summary>
 /// Pop-up editor for creating a <see cref="Point"/>.
 /// </summary>
-public partial class PointEditor {
+public partial class PointEditor : IValueGetterDialog {
 
     /// <summary>
     /// Gets a value indicating whether user cancelled the dialog before
@@ -32,6 +35,8 @@ public partial class PointEditor {
     /// </summary>
     public float ResultY {get;private set;}
 
+    [CanBeNull] public object Result => new PointF(ResultX, ResultY);
+
     /// <summary>
     /// Creates a new instance of the <see cref="PointEditor"/> class.
     /// </summary>

src/UI/Windows/PosEditor.cs

@@ -7,6 +7,8 @@
 // </auto-generated>
 //------------------------------------------------------------------------------
 
+using JetBrains.Annotations;
+
 namespace TerminalGuiDesigner.UI.Windows;
 
 using Terminal.Gui;
@@ -18,15 +20,16 @@ namespace TerminalGuiDesigner.UI.Windows;
 /// <summary>
 /// Editor for the <see cref="Pos"/> type.
 /// </summary>
-public partial class PosEditor : Dialog {
+public partial class PosEditor : Dialog, IValueGetterDialog {
 
     private Design design;
 
     /// <summary>
     /// Users configured <see cref="Pos"/> (assembled from radio button
     /// selected and text values entered - offset etc).
     /// </summary>
-    public Pos Result { get; private set; }
+    [CanBeNull]
+    public object Result { get; private set; }
 
     /// <summary>
     /// True if user cancelled the dialog instead of hitting Ok.

src/UI/Windows/SizeEditor.cs

@@ -14,13 +14,13 @@ namespace TerminalGuiDesigner.UI.Windows;
 /// <summary>
 /// Popup editor for the <see cref="Size"/> class.
 /// </summary>
-public partial class SizeEditor
+public partial class SizeEditor : IValueGetterDialog
 {
 
     /// <summary>
     /// The users edited <see cref="Size"/> 
     /// </summary>
-    public Size Result { get; private set; }
+    public object? Result { get; private set; }
 
     /// <summary>
     /// True if user cancelled the dialog instead of hitting "Ok".

src/UI/Windows/SliderOptionEditor.cs

@@ -7,13 +7,16 @@
 //      You can make changes to this file and they will not be overwritten when saving.
 //  </auto-generated>
 // -----------------------------------------------------------------------------
+
+
 namespace TerminalGuiDesigner.UI.Windows {
     using System.Reflection;
     using System.Text;
     using Terminal.Gui;
 
 
-    public partial class SliderOptionEditor {
+    public partial class SliderOptionEditor : IValueGetterDialog
+    {
         private readonly Type genericTypeArgument;
         private readonly Type sliderOptionType;