Fixed some edge cases around not using enter

2 files changed, 12 insertions, 6 deletions

diff --git a/grapher/Field.cs b/grapher/Field.cs
index d34472b..8d75172 100644
--- a/grapher/Field.cs
+++ b/grapher/Field.cs
@@ -12,7 +12,7 @@ namespace grapher
     {
         #region Constants
 
-        public const string DefaultFormatString = "#.#########";
+        public const string DefaultFormatString = "0.#########";
 
         #endregion Constants
 
@@ -173,7 +173,6 @@ namespace grapher
             if (State == FieldState.Typing)
             {
                 TextToData();
-                SetToEntered();
             }
         }
 
@@ -185,8 +184,6 @@ namespace grapher
 
                 e.Handled = true;
                 e.SuppressKeyPress = true;
-
-                SetToEntered();
             }
             else if (e.KeyCode == Keys.Escape)
             {
@@ -207,6 +204,15 @@ namespace grapher
             }
 
             Box.Text = DecimalString(Data);
+            
+            if (string.Equals(Box.Text, DefaultText))
+            {
+                SetToDefault();
+            }
+            else
+            {
+                SetToEntered();
+            }
         }
 
         private string DecimalString(double value)
diff --git a/grapher/FieldXY.cs b/grapher/FieldXY.cs
index 87bda18..87e0b9c 100644
--- a/grapher/FieldXY.cs
+++ b/grapher/FieldXY.cs
@@ -9,9 +9,9 @@ namespace grapher
 {
     public class FieldXY
     {
-        public const int DefaultSeparation = 6;
+        public const int DefaultSeparation = 4;
 
-        public const string ShortenedFormatString = "#.###";
+        public const string ShortenedFormatString = "0.###";
 
         public FieldXY(TextBox xBox, TextBox yBox, CheckBox lockCheckBox, Form containingForm, double defaultData)
         {