diff options
| -rw-r--r-- | grapher/Constants/Constants.cs | 8 | ||||
| -rw-r--r-- | grapher/Models/AccelGUIFactory.cs | 1 | ||||
| -rw-r--r-- | grapher/Models/Options/Directionality/DirectionalityOptions.cs | 30 |
3 files changed, 28 insertions, 11 deletions
diff --git a/grapher/Constants/Constants.cs b/grapher/Constants/Constants.cs index 7ebb2cc..b86874f 100644 --- a/grapher/Constants/Constants.cs +++ b/grapher/Constants/Constants.cs @@ -62,7 +62,7 @@ namespace grapher public const int ButtonVerticalOffset = 60; /// <summary> Padding between directionality title and containing panel </summary> - public const int DirectionalityTitlePad = 4; + public const int DirectionalityTitlePad = 8; public const float SmallButtonSizeFactor = 0.666f; @@ -114,6 +114,12 @@ namespace grapher /// <summary> Default name of settings file. </summary> public const string DefaultSettingsFileName = @"settings.json"; + /// <summary> Text to direcitonality panel title when panel is closed. </summary> + public const string DirectionalityTitleClosed = "Directionality\u25BC"; + + /// <summary> Text to direcitonality panel title when panel is open. </summary> + public const string DirectionalityTitleOpen = "Directionality\u25B2"; + /// <summary> Style used by System.Double.Parse </summary> public const NumberStyles FloatStyle = NumberStyles.Float | NumberStyles.AllowThousands; diff --git a/grapher/Models/AccelGUIFactory.cs b/grapher/Models/AccelGUIFactory.cs index 1035cb7..e8def16 100644 --- a/grapher/Models/AccelGUIFactory.cs +++ b/grapher/Models/AccelGUIFactory.cs @@ -371,6 +371,7 @@ namespace grapher.Models directionalityLabel, directionalityX, directionalityY, + direcionalityActiveValueTitle, lpNorm, domain, range, diff --git a/grapher/Models/Options/Directionality/DirectionalityOptions.cs b/grapher/Models/Options/Directionality/DirectionalityOptions.cs index df1b4de..c83ea52 100644 --- a/grapher/Models/Options/Directionality/DirectionalityOptions.cs +++ b/grapher/Models/Options/Directionality/DirectionalityOptions.cs @@ -15,6 +15,7 @@ namespace grapher.Models.Options.Directionality Label directionalityLabel, Label directionalityX, Label directionalityY, + Label directionalityActiveValueTitle, Option lpNorm, OptionXY domain, OptionXY range, @@ -25,6 +26,7 @@ namespace grapher.Models.Options.Directionality DirectionalityLabel = directionalityLabel; DirectionalityX = directionalityX; DirectionalityY = directionalityY; + DirectionalityActiveValueTitle = directionalityActiveValueTitle; LpNorm = lpNorm; Domain = domain; Range = range; @@ -32,9 +34,9 @@ namespace grapher.Models.Options.Directionality ByComponentCheckBox = byComponentCheckBox; ContainingPanel.Paint += panel_Paint; - directionalityLabel.Click += title_click; - DirectionalityLabel.Left = ContainingPanel.Left + Constants.DirectionalityTitlePad; - DirectionalityLabel.Top = ContainingPanel.Top + Constants.DirectionalityTitlePad; + DirectionalityLabel.Click += title_click; + DirectionalityLabel.Left = Constants.DirectionalityTitlePad; + DirectionalityLabel.Top = Constants.DirectionalityTitlePad; IsHidden = false; ToWhole(); Hide(); @@ -48,6 +50,8 @@ namespace grapher.Models.Options.Directionality public Label DirectionalityY { get; } + public Label DirectionalityActiveValueTitle { get; } + public Option LpNorm { get; } public OptionXY Domain { get; } @@ -123,11 +127,13 @@ namespace grapher.Models.Options.Directionality { DirectionalityX.Hide(); DirectionalityY.Hide(); + DirectionalityActiveValueTitle.Hide(); LpNorm.Hide(); Domain.Hide(); Range.Hide(); WholeCheckBox.Hide(); ByComponentCheckBox.Hide(); + DirectionalityLabel.Text = Constants.DirectionalityTitleClosed; DrawHidden(); IsHidden = true; } @@ -137,13 +143,15 @@ namespace grapher.Models.Options.Directionality { if (IsHidden) { - DirectionalityX.Hide(); - DirectionalityY.Hide(); - LpNorm.Hide(); - Domain.Hide(); - Range.Hide(); - WholeCheckBox.Hide(); - ByComponentCheckBox.Hide(); + DirectionalityX.Show(); + DirectionalityY.Show(); + DirectionalityActiveValueTitle.Show(); + LpNorm.Show(); + Domain.Show(); + Range.Show(); + WholeCheckBox.Show(); + ByComponentCheckBox.Show(); + DirectionalityLabel.Text = Constants.DirectionalityTitleOpen; DrawShown(); IsHidden = false; } @@ -166,11 +174,13 @@ namespace grapher.Models.Options.Directionality private void DrawHidden() { ContainingPanel.Height = DirectionalityLabel.Height + 2 * Constants.DirectionalityTitlePad; + ContainingPanel.Invalidate(); } private void DrawShown() { ContainingPanel.Height = WholeCheckBox.Bottom - DirectionalityLabel.Top + 2 * Constants.DirectionalityTitlePad; + ContainingPanel.Invalidate(); } private void panel_Paint(object sender, PaintEventArgs e) |