From 6432e9b8b0b25f6a3b04b7f87eaff7d84d04c960 Mon Sep 17 00:00:00 2001
From: Sidiouth <66497848+Sidiouth@users.noreply.github.com>
Date: Mon, 31 Aug 2020 16:15:58 -0400
Subject: Initial commit

-Right-alight option labels in the gui
-Allow users to modify the string already in the options field
---
 grapher/Form1.Designer.cs          | 2 +-
 grapher/Layouts/LayoutBase.cs      | 2 +-
 grapher/Models/Fields/Field.cs     | 2 +-
 grapher/Models/Options/Option.cs   | 3 ++-
 grapher/Models/Options/OptionXY.cs | 3 ++-
 5 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/grapher/Form1.Designer.cs b/grapher/Form1.Designer.cs
index ac438a1..70455ce 100644
--- a/grapher/Form1.Designer.cs
+++ b/grapher/Form1.Designer.cs
@@ -191,7 +191,7 @@ namespace grapher
             // 
             // accelerationBox
             // 
-            this.accelerationBox.Location = new System.Drawing.Point(106, 125);
+            this.accelerationBox.Location = new System.Drawing.Point(105, 125);
             this.accelerationBox.Name = "accelerationBox";
             this.accelerationBox.Size = new System.Drawing.Size(69, 20);
             this.accelerationBox.TabIndex = 7;
diff --git a/grapher/Layouts/LayoutBase.cs b/grapher/Layouts/LayoutBase.cs
index a4d0827..263c8c5 100644
--- a/grapher/Layouts/LayoutBase.cs
+++ b/grapher/Layouts/LayoutBase.cs
@@ -43,7 +43,7 @@ namespace grapher.Layouts
         public void Layout(Option[] options, OptionXY[] optionsXY, Button button)
         {
             // Relies on AccelOptions to keep lengths correct.
-            for (int i = 0; i< options.Length; i++)
+            for (int i = 0; i < options.Length; i++)
             {
                 if (ShowOptions[i])
                 {
diff --git a/grapher/Models/Fields/Field.cs b/grapher/Models/Fields/Field.cs
index 8d75172..1810081 100644
--- a/grapher/Models/Fields/Field.cs
+++ b/grapher/Models/Fields/Field.cs
@@ -97,7 +97,7 @@ namespace grapher
                 State = FieldState.Typing;
             }
 
-            Box.Text = string.Empty;
+            Box.Text = Data.ToString();
         }
 
         public void SetToEntered()
diff --git a/grapher/Models/Options/Option.cs b/grapher/Models/Options/Option.cs
index bacd760..b0ef374 100644
--- a/grapher/Models/Options/Option.cs
+++ b/grapher/Models/Options/Option.cs
@@ -59,7 +59,8 @@ namespace grapher
         public void SetName(string name)
         {
             Label.Text = name;
-            Label.Left = Convert.ToInt32((Field.Box.Left / 2.0) - (Label.Width / 2.0));
+            //Label.Left = Convert.ToInt32((Field.Box.Left / 2.0) - (Label.Width / 2.0));   //Centered
+            Label.Left = Convert.ToInt32(Field.Box.Left - Label.Width - 10);    //Right-aligned
         }
 
         public void SetActiveValue(double value)
diff --git a/grapher/Models/Options/OptionXY.cs b/grapher/Models/Options/OptionXY.cs
index b22bb78..8e22617 100644
--- a/grapher/Models/Options/OptionXY.cs
+++ b/grapher/Models/Options/OptionXY.cs
@@ -62,7 +62,8 @@ namespace grapher
         public void SetName(string name)
         {
             Label.Text = name;
-            Label.Left = Convert.ToInt32((Fields.XField.Box.Left / 2.0) - (Label.Width / 2.0));
+            //Label.Left = Convert.ToInt32((Fields.XField.Box.Left / 2.0) - (Label.Width / 2.0));   //Centered
+            Label.Left = Convert.ToInt32(Fields.XField.Box.Left - Label.Width - 10);    //Right-aligned
         }
 
         public void SetActiveValues(double x, double y)
-- 
cgit v1.2.3