diff options
| author | JacobPalecki <[email protected]> | 2020-08-31 23:06:21 -0700 |
|---|---|---|
| committer | GitHub <[email protected]> | 2020-08-31 23:06:21 -0700 |
| commit | 26138cb0e38358f15dd560d4a7b229926f534a89 (patch) | |
| tree | 565614055bb152c0a68656f5d6781fb7dbc8e07c | |
| parent | Merge pull request #17 from a1xd/indep (diff) | |
| parent | Initial commit (diff) | |
| download | rawaccel-26138cb0e38358f15dd560d4a7b229926f534a89.tar.xz rawaccel-26138cb0e38358f15dd560d4a7b229926f534a89.zip | |
Merge pull request #1 from Sidiouth/sidi
Small GUI tweaks
| -rw-r--r-- | grapher/Form1.Designer.cs | 2 | ||||
| -rw-r--r-- | grapher/Layouts/LayoutBase.cs | 2 | ||||
| -rw-r--r-- | grapher/Models/Fields/Field.cs | 2 | ||||
| -rw-r--r-- | grapher/Models/Options/Option.cs | 3 | ||||
| -rw-r--r-- | 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 3ae2e90..eed1716 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) |