Fix few small bugs

11 files changed, 174 insertions, 32 deletions

diff --git a/grapher/Models/Fields/FieldXY.cs b/grapher/Models/Fields/FieldXY.cs
index 6f43998..15e6800 100644
--- a/grapher/Models/Fields/FieldXY.cs
+++ b/grapher/Models/Fields/FieldXY.cs
@@ -64,6 +64,50 @@ namespace grapher
             {
                 return XField.Left;
             }
+            set
+            {
+            }
+        }
+
+        public int Width
+        {
+            get
+            {
+                return CombinedWidth;
+            }
+            set
+            {
+            }
+        }
+
+        public int Top
+        {
+            get
+            {
+                return XField.Top;
+            }
+            set
+            {
+            }
+        }
+
+        public int Height
+        {
+            get
+            {
+                return XField.Height;
+            }
+            set
+            {
+            }
+        }
+
+        public bool Visible
+        {
+            get
+            {
+                return XField.Box.Visible;
+            }
         }
 
         private bool Combined { get; set; }
diff --git a/grapher/Models/Options/AccelOptionSet.cs b/grapher/Models/Options/AccelOptionSet.cs
index a5399da..bc0d368 100644
--- a/grapher/Models/Options/AccelOptionSet.cs
+++ b/grapher/Models/Options/AccelOptionSet.cs
@@ -109,9 +109,9 @@ namespace grapher.Models.Options
             Options.SetActiveValues(mode, args);
         }
 
-        public void AlignActiveValuesByTitle()
+        public void AlignActiveValues()
         {
-            Options.AlignActiveValues(ActiveValuesTitle.Width);
+            Options.AlignActiveValues();
         }
     }
 }
diff --git a/grapher/Models/Options/AccelTypeOptions.cs b/grapher/Models/Options/AccelTypeOptions.cs
index 3739189..86a28f4 100644
--- a/grapher/Models/Options/AccelTypeOptions.cs
+++ b/grapher/Models/Options/AccelTypeOptions.cs
@@ -52,6 +52,8 @@ namespace grapher
             WriteButton = writeButton;
             AccelTypeActiveValue = accelTypeActiveValue;
 
+            AccelTypeActiveValue.Height = AccelDropdown.Height;
+
             Layout("Off");
             ShowingDefault = true;
         }
@@ -166,6 +168,7 @@ namespace grapher
         public void Show()
         {
             AccelDropdown.Show();
+            AccelTypeActiveValue.Show();
             Layout();
         }
 
@@ -232,16 +235,15 @@ namespace grapher
             return args;
         }
 
-        public override void AlignActiveValues(int width)
+        public override void AlignActiveValues()
         {
-            AccelTypeActiveValue.Width = width;
-
-            Acceleration.AlignActiveValues(width);
-            Cap.AlignActiveValues(width);
-            Offset.AlignActiveValues(width);
-            Weight.AlignActiveValues(width);
-            LimitOrExponent.AlignActiveValues(width);
-            Midpoint.AlignActiveValues(width);
+            AccelTypeActiveValue.Align();
+            Acceleration.AlignActiveValues();
+            Cap.AlignActiveValues();
+            Offset.AlignActiveValues();
+            Weight.AlignActiveValues();
+            LimitOrExponent.AlignActiveValues();
+            Midpoint.AlignActiveValues();
         }
 
         private void OnIndexChanged(object sender, EventArgs e)
diff --git a/grapher/Models/Options/ActiveValueLabel.cs b/grapher/Models/Options/ActiveValueLabel.cs
index df7ac42..18a4400 100644
--- a/grapher/Models/Options/ActiveValueLabel.cs
+++ b/grapher/Models/Options/ActiveValueLabel.cs
@@ -22,11 +22,12 @@ namespace grapher.Models.Options
         public ActiveValueLabel(Label valueLabel, Label centeringLabel)
         {
             ValueLabel = valueLabel;
-            ValueLabel.ForeColor = Constants.ActiveValueFontColor;
-            Left = centeringLabel.Left;
-            Width = centeringLabel.Width;
             ValueLabel.AutoSize = false;
             ValueLabel.TextAlign = ContentAlignment.MiddleCenter;
+            ValueLabel.ForeColor = Constants.ActiveValueFontColor;
+
+            CenteringLabel = centeringLabel;
+            Align();
 
             FormatString = Constants.DefaultActiveValueFormatString;
             Prefix = string.Empty;
@@ -98,6 +99,21 @@ namespace grapher.Models.Options
             }
         }
 
+        public int Height
+        {
+            get 
+            {
+                return ValueLabel.Height;
+            }
+
+            set
+            {
+                ValueLabel.Height = value;
+            }
+        }
+
+        public Label CenteringLabel { get; }
+
         #endregion Properties
 
         #region Methods
@@ -127,6 +143,12 @@ namespace grapher.Models.Options
             ValueLabel.Text = string.IsNullOrWhiteSpace(Prefix) ? Value: $"{Prefix}: {Value}";
         }
 
+        public void Align()
+        {
+            Left = CenteringLabel.Left;
+            Width = CenteringLabel.Width;
+        }
+
         #endregion Methods
     }
 }
diff --git a/grapher/Models/Options/ActiveValueLabelXY.cs b/grapher/Models/Options/ActiveValueLabelXY.cs
index ffe57b7..9498c66 100644
--- a/grapher/Models/Options/ActiveValueLabelXY.cs
+++ b/grapher/Models/Options/ActiveValueLabelXY.cs
@@ -47,6 +47,19 @@
             }
         }
 
+        public int Height
+        {
+            get
+            {
+                return X.Height;
+            }
+            set
+            {
+                X.Height = value;
+                Y.Height = value;
+            }
+        }
+
         private int FullWidth { get; set; }
 
         private int ShortenedWidth { get; set; }
@@ -97,9 +110,9 @@
             Combined = false;
         }
 
-        public void AlignActiveValues(int width)
+        public void AlignActiveValues()
         {
-            Align(width);
+            Align(X.CenteringLabel.Width);
 
             if (Combined)
             {
diff --git a/grapher/Models/Options/ApplyOptions.cs b/grapher/Models/Options/ApplyOptions.cs
index 6ff2753..29f923d 100644
--- a/grapher/Models/Options/ApplyOptions.cs
+++ b/grapher/Models/Options/ApplyOptions.cs
@@ -43,6 +43,8 @@ namespace grapher.Models.Options
             ByComponentVectorXYLock.CheckedChanged += new System.EventHandler(OnByComponentXYLockChecked);
             ByComponentVectorXYLock.Checked = true;
 
+            Rotation.SnapTo(Sensitivity);
+
             EnableWholeApplication();
         }
 
@@ -229,9 +231,15 @@ namespace grapher.Models.Options
             LockXYLabel.Left = OptionSetX.ActiveValuesTitle.Left + OptionSetX.ActiveValuesTitle.Width;
             Sensitivity.Fields.LockCheckBox.Left = LockXYLabel.Left + LockXYLabel.Width / 2 - Sensitivity.Fields.LockCheckBox.Width / 2;
             ByComponentVectorXYLock.Left = Sensitivity.Fields.LockCheckBox.Left;
-            OptionSetX.AlignActiveValuesByTitle();
-            Sensitivity.AlignActiveValues(OptionSetX.ActiveValuesTitle.Width);
-            Rotation.AlignActiveValues(OptionSetX.ActiveValuesTitle.Width);
+            AlignActiveValues();
+        }
+
+        private void AlignActiveValues()
+        {
+            OptionSetX.AlignActiveValues();
+            OptionSetY.AlignActiveValues();
+            Sensitivity.AlignActiveValues();
+            Rotation.AlignActiveValues();
         }
 
         #endregion Methods
diff --git a/grapher/Models/Options/CapOptions.cs b/grapher/Models/Options/CapOptions.cs
index 8a0865a..5e47d7b 100644
--- a/grapher/Models/Options/CapOptions.cs
+++ b/grapher/Models/Options/CapOptions.cs
@@ -169,9 +169,9 @@ namespace grapher
             }
         }
 
-        public override void AlignActiveValues(int width)
+        public override void AlignActiveValues()
         {
-            CapOption.AlignActiveValues(width);
+            CapOption.AlignActiveValues();
         }
 
         void OnSensitivityCapCheckClick(object sender, EventArgs e)
diff --git a/grapher/Models/Options/OffsetOptions.cs b/grapher/Models/Options/OffsetOptions.cs
index f68d16d..b351ab5 100644
--- a/grapher/Models/Options/OffsetOptions.cs
+++ b/grapher/Models/Options/OffsetOptions.cs
@@ -140,9 +140,9 @@ namespace grapher.Models.Options
             }
         }
 
-        public override void AlignActiveValues(int width)
+        public override void AlignActiveValues()
         {
-            OffsetOption.AlignActiveValues(width);
+            OffsetOption.AlignActiveValues();
         }
 
         public void OnVelocityGainOffsetClick(object sender, EventArgs e)
diff --git a/grapher/Models/Options/Option.cs b/grapher/Models/Options/Option.cs
index f44e6b1..5dc022b 100644
--- a/grapher/Models/Options/Option.cs
+++ b/grapher/Models/Options/Option.cs
@@ -19,10 +19,12 @@ namespace grapher
             Left = left;
 
             label.AutoSize = false;
-            label.Width = Field.Left - left - Constants.OptionLabelBoxSeperation;
             label.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
+            label.Width = Field.Left - left - Constants.OptionLabelBoxSeperation;
+            label.Height = Field.Height;
 
             ActiveValueLabel.Left = Field.Left + Field.Width;
+            ActiveValueLabel.Height = Field.Height;
         }
 
         public Option(
@@ -162,9 +164,9 @@ namespace grapher
             Show();
         }
 
-        public override void AlignActiveValues(int width)
+        public override void AlignActiveValues()
         {
-            ActiveValueLabel.Width = width;
+            ActiveValueLabel.Align();
         }
 
         #endregion Methods
diff --git a/grapher/Models/Options/OptionBase.cs b/grapher/Models/Options/OptionBase.cs
index 77a1038..5f6dca1 100644
--- a/grapher/Models/Options/OptionBase.cs
+++ b/grapher/Models/Options/OptionBase.cs
@@ -23,7 +23,7 @@
 
         public abstract void Hide();
 
-        public abstract void AlignActiveValues(int width);
+        public abstract void AlignActiveValues();
 
         public virtual void SnapTo(IOption option)
         {
diff --git a/grapher/Models/Options/OptionXY.cs b/grapher/Models/Options/OptionXY.cs
index 9150587..6d6129a 100644
--- a/grapher/Models/Options/OptionXY.cs
+++ b/grapher/Models/Options/OptionXY.cs
@@ -4,7 +4,7 @@ using System.Windows.Forms;
 
 namespace grapher
 {
-    public class OptionXY
+    public class OptionXY : OptionBase
     {
         #region Constructors
         public OptionXY(FieldXY fields, Label label, ActiveValueLabelXY activeValueLabels)
@@ -58,6 +58,57 @@ namespace grapher
 
         public ActiveValueLabelXY ActiveValueLabels { get; }
 
+        public override int Top
+        {
+            get
+            {
+                return Fields.Top;
+            }
+            set
+            {
+                Fields.Top = value;
+            }
+        }
+
+        public override int Height
+        {
+            get
+            {
+                return Fields.Height;
+            }
+        }
+
+        public override int Left
+        {
+            get
+            {
+                return Fields.Left;
+            }
+            set
+            {
+                Fields.Left = value;
+            }
+        }
+
+        public override int Width 
+        {
+            get
+            {
+                return Fields.Width;
+            }
+            set
+            {
+                Fields.Width = value;
+            }
+        }
+
+        public override bool Visible
+        {
+            get
+            {
+                return Fields.Visible;
+            }
+        }
         #endregion Properties
 
         #region Methods
@@ -74,12 +125,12 @@ namespace grapher
             ActiveValueLabels.SetValues(x, y);
         }
 
-        public void AlignActiveValues(int width)
+        public override void AlignActiveValues()
         {
-            ActiveValueLabels.AlignActiveValues(width);
+            ActiveValueLabels.AlignActiveValues();
         }
 
-        public void Hide()
+        public override void Hide()
         {
             Fields.Hide();
             Fields.LockCheckBox.Hide();
@@ -93,7 +144,7 @@ namespace grapher
             Label.Show();
         }
 
-        public void Show(string name)
+        public override void Show(string name)
         {
             SetName(name);