diff options
| author | Jacob Palecki <[email protected]> | 2020-09-22 14:16:34 -0700 |
|---|---|---|
| committer | Jacob Palecki <[email protected]> | 2020-09-22 14:16:34 -0700 |
| commit | 20b0304e0edc12eb983707c44f69a1c2be23ae4c (patch) | |
| tree | 482632a7f4e2667f80df8ff97369f78627af1e03 | |
| parent | Fix cap style defaulting to legacy (diff) | |
| download | rawaccel-20b0304e0edc12eb983707c44f69a1c2be23ae4c.tar.xz rawaccel-20b0304e0edc12eb983707c44f69a1c2be23ae4c.zip | |
Rename active to current, make dropdown display accel type on active value set
| -rw-r--r-- | grapher/Form1.Designer.cs | 8 | ||||
| -rw-r--r-- | grapher/Models/Options/AccelTypeOptions.cs | 3 | ||||
| -rw-r--r-- | grapher/Models/Options/ActiveValueLabel.cs | 5 |
3 files changed, 6 insertions, 10 deletions
diff --git a/grapher/Form1.Designer.cs b/grapher/Form1.Designer.cs index ecfb978..5d2a645 100644 --- a/grapher/Form1.Designer.cs +++ b/grapher/Form1.Designer.cs @@ -781,9 +781,9 @@ namespace grapher this.ActiveValueTitle.AutoSize = true; this.ActiveValueTitle.Location = new System.Drawing.Point(187, 30); this.ActiveValueTitle.Name = "ActiveValueTitle"; - this.ActiveValueTitle.Size = new System.Drawing.Size(37, 13); + this.ActiveValueTitle.Size = new System.Drawing.Size(41, 13); this.ActiveValueTitle.TabIndex = 35; - this.ActiveValueTitle.Text = "Active"; + this.ActiveValueTitle.Text = "Current"; // // SensitivityActiveXLabel // @@ -1063,9 +1063,9 @@ namespace grapher this.ActiveValueTitleY.AutoSize = true; this.ActiveValueTitleY.Location = new System.Drawing.Point(428, 30); this.ActiveValueTitleY.Name = "ActiveValueTitleY"; - this.ActiveValueTitleY.Size = new System.Drawing.Size(37, 13); + this.ActiveValueTitleY.Size = new System.Drawing.Size(41, 13); this.ActiveValueTitleY.TabIndex = 67; - this.ActiveValueTitleY.Text = "Active"; + this.ActiveValueTitleY.Text = "Current"; // // RawAcceleration // diff --git a/grapher/Models/Options/AccelTypeOptions.cs b/grapher/Models/Options/AccelTypeOptions.cs index d93be16..ef0964b 100644 --- a/grapher/Models/Options/AccelTypeOptions.cs +++ b/grapher/Models/Options/AccelTypeOptions.cs @@ -183,6 +183,7 @@ namespace grapher { AccelerationType = AccelerationTypes.Where(t => t.Value.Index == index).FirstOrDefault().Value; AccelTypeActiveValue.SetValue(AccelerationType.Name); + AccelDropdown.SelectedIndex = AccelerationType.Index; Weight.SetActiveValue(args.weight); Cap.SetActiveValues(args.gainCap, args.scaleCap, args.gainCap > 0 || args.scaleCap <= 0); @@ -191,7 +192,7 @@ namespace grapher LimitOrExponent.SetActiveValue(args.exponent); Midpoint.SetActiveValue(args.midpoint); - Layout(); + //Layout(); } public void ShowFull() diff --git a/grapher/Models/Options/ActiveValueLabel.cs b/grapher/Models/Options/ActiveValueLabel.cs index 18a4400..66817ab 100644 --- a/grapher/Models/Options/ActiveValueLabel.cs +++ b/grapher/Models/Options/ActiveValueLabel.cs @@ -5,11 +5,6 @@ namespace grapher.Models.Options { public class ActiveValueLabel { - #region Constants - - - #endregion Constants - #region Fields private string _prefix; |