diff options
| author | JacobPalecki <[email protected]> | 2020-09-21 14:20:18 -0700 |
|---|---|---|
| committer | GitHub <[email protected]> | 2020-09-21 14:20:18 -0700 |
| commit | 4ec16a2ff35e0e910a13f92713d56d317b24e790 (patch) | |
| tree | c4aead24d52e3002cfd3282ddd697a3766de405a /grapher/Models/Fields | |
| parent | Merge pull request #20 from JacobPalecki/GUI (diff) | |
| parent | x/y diff sens works (diff) | |
| download | rawaccel-4ec16a2ff35e0e910a13f92713d56d317b24e790.tar.xz rawaccel-4ec16a2ff35e0e910a13f92713d56d317b24e790.zip | |
Merge pull request #21 from JacobPalecki/GUI
GUI: Icon, Separate X/Y sens mode, some fixes
Diffstat (limited to 'grapher/Models/Fields')
| -rw-r--r-- | grapher/Models/Fields/Field.cs | 14 | ||||
| -rw-r--r-- | grapher/Models/Fields/FieldXY.cs | 16 |
2 files changed, 21 insertions, 9 deletions
diff --git a/grapher/Models/Fields/Field.cs b/grapher/Models/Fields/Field.cs index 0d1813e..df73dd7 100644 --- a/grapher/Models/Fields/Field.cs +++ b/grapher/Models/Fields/Field.cs @@ -61,7 +61,7 @@ namespace grapher public double Data { get { - if (Box.Visible) + if (Box.Enabled) { return _data; } @@ -126,6 +126,18 @@ namespace grapher #region Methods + public void Hide() + { + Box.Hide(); + Box.Enabled = false; + } + + public void Show() + { + Box.Show(); + Box.Enabled = true; + } + public void SetToDefault() { if (State != FieldState.Default) diff --git a/grapher/Models/Fields/FieldXY.cs b/grapher/Models/Fields/FieldXY.cs index 15e6800..1c01668 100644 --- a/grapher/Models/Fields/FieldXY.cs +++ b/grapher/Models/Fields/FieldXY.cs @@ -106,7 +106,7 @@ namespace grapher { get { - return XField.Box.Visible; + return XField.Box.Enabled; } } @@ -137,7 +137,7 @@ namespace grapher { Combined = true; YField.SetToUnavailable(); - YField.Box.Hide(); + YField.Hide(); XField.Box.Width = CombinedWidth; XField.FormatString = Constants.DefaultFieldFormatString; } @@ -160,26 +160,26 @@ namespace grapher YField.SetToEntered(XField.Data); } - if (XField.Box.Visible) + if (XField.Box.Enabled) { - YField.Box.Show(); + YField.Show(); } } public void Show() { - XField.Box.Show(); + XField.Show(); if (!Combined) { - YField.Box.Show(); + YField.Show(); } } public void Hide() { - XField.Box.Hide(); - YField.Box.Hide(); + XField.Hide(); + YField.Hide(); } #endregion Methods |