Git_Mirror/Terminal.Gui
1
0
Fork 0
mirror of https://github.com/gui-cs/Terminal.Gui.git synced 2025-12-26 07:47:54 +01:00
Code Issues Packages Projects Releases Wiki Activity

Improve Dialog/MessageBox sizing and design-time support

Browse Source 
Refactor Dialog and MessageBox sizing logic to use the greater of percentage-based minimums or required subview size, ensuring dialogs are never too small for their content. Lower default minimum sizes for both Dialog and MessageBox.

Implement IDesignable for Dialog, providing design-time sample content and buttons. Dialog appearance now switches styles based on modal/design mode.

Refactor Dialogs demo for clarity, error handling, and modern C# usage. Update View content size calculations to include all subviews (including padding) for more accurate layout.

General code modernization: use C# 9/10 features, improve readability, and maintainability.
This commit is contained in:
Tig
2025-12-23 11:18:57 -07:00
parent 8e89239daa
commit fd3ac9c95e
11 changed files with 247 additions and 283 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
Examples/UICatalog/NumberToWords.cs
View File

@@ -1,16 +1,16 @@
using System;
#nullable enable
namespace UICatalog;
public static class NumberToWords
{
private static readonly string [] tens =
{
private static readonly string [] _tens =
[
"", "", "Twenty", "Thirty", "Forty", "Fifty", "Sixty", "Seventy", "Eighty", "Ninety"
};
];
private static readonly string [] units =
{
private static readonly string [] _units =
[
"Zero",
"One",
"Two",
@@ -31,23 +31,23 @@ public static class NumberToWords
"Seventeen",
"Eighteen",
"Nineteen"
};
];
public static string Convert (long i)
{
if (i < 20)
{
return units [i];
return _units [i];
}
if (i < 100)
{
return tens [i / 10] + (i % 10 > 0 ? " " + Convert (i % 10) : "");
return _tens [i / 10] + (i % 10 > 0 ? " " + Convert (i % 10) : "");
}
if (i < 1000)
{
return units [i / 100]
return _units [i / 100]
+ " Hundred"
+ (i % 100 > 0 ? " And " + Convert (i % 100) : "");
}
@@ -77,24 +77,4 @@ public static class NumberToWords
+ " Arab "
+ (i % 1000000000 > 0 ? " " + Convert (i % 1000000000) : "");
}
public static string ConvertAmount (double amount)
{
try
{
var amount_int = (long)amount;
var amount_dec = (long)Math.Round ((amount - amount_int) * 100);
if (amount_dec == 0)
{
return Convert (amount_int) + " Only.";
}
return Convert (amount_int) + " Point " + Convert (amount_dec) + " Only.";
}
catch (Exception e)
{
throw new ArgumentOutOfRangeException (e.Message);
}
}
}

276
Examples/UICatalog/Scenarios/Dialogs.cs
View File

@@ -1,25 +1,22 @@
using System;
using System.Collections.Generic;
using System.Linq;
#nullable enable
namespace UICatalog.Scenarios;
[ScenarioMetadata ("Dialogs", "Demonstrates how to the Dialog class")]
[ScenarioCategory ("Dialogs")]
public class Dialogs : Scenario
{
private static readonly int CODE_POINT = '你'; // We know this is a wide char
private const int CODE_POINT = '你'; // We know this is a wide char
public override void Main ()
{
Application.Init ();
Window app = new ()
{
Title = GetQuitKeyAndName ()
};
using IApplication app = Application.Instance;
var frame = new FrameView
using Window mainWindow = new ();
mainWindow.Title = GetQuitKeyAndName ();
FrameView frame = new ()
{
TabStop = TabBehavior.TabStop, // FrameView normally sets to TabGroup
X = Pos.Center (),
@@ -29,14 +26,14 @@ public class Dialogs : Scenario
Title = "Dialog Options"
};
var numButtonsLabel = new Label
Label numButtonsLabel = new ()
{
X = 0,
TextAlignment = Alignment.End,
Text = "_Number of Buttons:"
};
var label = new Label
Label label = new ()
{
X = 0,
Y = 0,
@@ -47,7 +44,7 @@ public class Dialogs : Scenario
};
frame.Add (label);
var widthEdit = new TextField
TextField widthEdit = new ()
{
X = Pos.Right (numButtonsLabel) + 1,
Y = Pos.Top (label),
@@ -68,7 +65,7 @@ public class Dialogs : Scenario
};
frame.Add (label);
var heightEdit = new TextField
TextField heightEdit = new ()
{
X = Pos.Right (numButtonsLabel) + 1,
Y = Pos.Top (label),
@@ -107,7 +104,7 @@ public class Dialogs : Scenario
};
frame.Add (label);
var titleEdit = new TextField
TextField titleEdit = new ()
{
X = Pos.Right (label) + 1,
Y = Pos.Top (label),
@@ -120,7 +117,7 @@ public class Dialogs : Scenario
numButtonsLabel.Y = Pos.Bottom (label);
frame.Add (numButtonsLabel);
var numButtonsEdit = new TextField
TextField numButtonsEdit = new ()
{
X = Pos.Right (numButtonsLabel) + 1,
Y = Pos.Top (numButtonsLabel),
@@ -130,7 +127,7 @@ public class Dialogs : Scenario
};
frame.Add (numButtonsEdit);
var glyphsNotWords = new CheckBox
CheckBox glyphsNotWords = new ()
{
X = Pos.Right (numButtonsLabel) + 1,
Y = Pos.Bottom (numButtonsLabel),
@@ -163,51 +160,55 @@ public class Dialogs : Scenario
frame.ValidatePosDim = true;
app.Add (frame);
mainWindow.Add (frame);
label = new ()
{
X = Pos.Center (), Y = Pos.Bottom (frame) + 4, TextAlignment = Alignment.End, Text = "Button Pressed:"
};
app.Add (label);
mainWindow.Add (label);
var buttonPressedLabel = new Label
Label buttonPressedLabel = new ()
{
X = Pos.Center (), Y = Pos.Bottom (frame) + 5, SchemeName = "Error", Text = " "
};
var showDialogButton = new Button
Button showDialogButton = new ()
{
X = Pos.Center (), Y = Pos.Bottom (frame) + 2, IsDefault = true, Text = "_Show Dialog"
};
app.Accepting += (s, e) =>
mainWindow.Accepting += (s, e) =>
{
Dialog dlg = CreateDemoDialog (
widthEdit,
heightEdit,
titleEdit,
numButtonsEdit,
glyphsNotWords,
alignmentOptionSelector,
buttonPressedLabel
);
Application.Run (dlg);
dlg.Dispose ();
Dialog? dlg = CreateDemoDialog (
widthEdit,
heightEdit,
titleEdit,
numButtonsEdit,
glyphsNotWords,
alignmentOptionSelector,
buttonPressedLabel
);
if (dlg is null)
{
MessageBox.ErrorQuery ((s as View)!.App!, "Error", "Could not create Dialog. Invalid options.", "_Ok");
}
else
{
app.Run (dlg);
dlg.Dispose ();
}
e.Handled = true;
};
app.Add (showDialogButton);
mainWindow.Add (showDialogButton, buttonPressedLabel);
app.Add (buttonPressedLabel);
Application.Run (app);
app.Dispose ();
Application.Shutdown ();
app.Run (mainWindow);
}
private Dialog CreateDemoDialog (
private static Dialog? CreateDemoDialog (
TextField widthEdit,
TextField heightEdit,
TextField titleEdit,
@@ -217,157 +218,90 @@ public class Dialogs : Scenario
Label buttonPressedLabel
)
{
Dialog dialog = null;
try
if (!int.TryParse (widthEdit.Text, out int width)
|| !int.TryParse (heightEdit.Text, out int height)
|| !int.TryParse (numButtonsEdit.Text, out int numButtons))
{
var width = 0;
int.TryParse (widthEdit.Text, out width);
var height = 0;
int.TryParse (heightEdit.Text, out height);
var numButtons = 3;
int.TryParse (numButtonsEdit.Text, out numButtons);
return null;
}
List<Button> buttons = new ();
int clicked = -1;
// Add the buttons that go on the bottom of the dialog
List<Button> dlgButtons = [];
int clicked = -1;
for (var i = 0; i < numButtons; i++)
for (var i = 0; i < numButtons; i++)
{
int buttonId = i;
Button button;
if (glyphsNotWords.CheckedState == CheckState.Checked)
{
int buttonId = i;
Button button = null;
buttonId = i;
if (glyphsNotWords.CheckedState == CheckState.Checked)
button = new ()
{
buttonId = i;
button = new ()
{
Text = "_" + NumberToWords.Convert (buttonId) + " " + char.ConvertFromUtf32 (buttonId + CODE_POINT),
IsDefault = buttonId == 0
};
}
else
{
button = new () { Text = "_" + NumberToWords.Convert (buttonId), IsDefault = buttonId == 0 };
}
button.Accepting += (s, e) =>
{
clicked = buttonId;
e.Handled = true;
Application.RequestStop ();
};
buttons.Add (button);
Text = "_" + NumberToWords.Convert (buttonId) + " " + char.ConvertFromUtf32 (buttonId + CODE_POINT),
};
}
else
{
button = new () { Text = "_" + NumberToWords.Convert (buttonId) };
}
// This tests dynamically adding buttons; ensuring the dialog resizes if needed and
// the buttons are laid out correctly
dialog = new ()
{
Title = titleEdit.Text,
Text = "Dialog Text",
ButtonAlignment = (Alignment)Enum.Parse (typeof (Alignment), alignmentGroup.Labels! [(int)alignmentGroup.Value!.Value] [0..]),
button.Accepting += (s, e) =>
{
clicked = buttonId;
e.Handled = true;
(s as View)!.App?.RequestStop ();
};
dlgButtons.Add (button);
}
Buttons = buttons.ToArray ()
};
// This tests dynamically adding buttons; ensuring the dialog resizes if needed and
// the buttons are laid out correctly
Dialog dialog = new ()
{
Title = titleEdit.Text,
Text = "Dialog Text - Test",
ButtonAlignment = (Alignment)Enum.Parse (typeof (Alignment), alignmentGroup.Labels! [alignmentGroup.Value!.Value] [0..]),
if (width != 0)
{
dialog.Width = width;
}
if (height != 0)
{
dialog.Height = height;
}
Buttons = dlgButtons.ToArray ()
};
var add = new Button
{
X = Pos.Center (),
Y = Pos.Center () - 1,
Text = "_Add a button"
};
if (width != 0)
{
dialog.Width = width;
}
if (height != 0)
{
dialog.Height = height;
}
add.Accepting += (s, e) =>
{
int buttonId = buttons.Count;
Button button;
if (glyphsNotWords.CheckedState == CheckState.Checked)
{
button = new ()
{
Text = "_" + NumberToWords.Convert (buttonId) + " " + char.ConvertFromUtf32 (buttonId + CODE_POINT),
IsDefault = buttonId == 0
};
}
else
{
button = new () { Text = "_" + NumberToWords.Convert (buttonId), IsDefault = buttonId == 0 };
}
button.Accepting += (s, e) =>
{
clicked = buttonId;
Application.RequestStop ();
e.Handled = true;
};
buttons.Add (button);
dialog.AddButton (button);
//if (buttons.Count > 1)
//{
// button.TabIndex = buttons [buttons.Count - 2].TabIndex + 1;
//}
e.Handled = true;
};
dialog.Add (add);
var addChar = new Button
{
X = Pos.Center (),
Y = Pos.Center () + 1,
Text = $"A_dd a {char.ConvertFromUtf32 (CODE_POINT)} to each button. This text is really long for a reason."
};
addChar.Accepting += (s, e) =>
{
foreach (Button button in buttons)
{
button.Text += char.ConvertFromUtf32 (CODE_POINT);
}
e.Handled = true;
};
dialog.Add (addChar);
dialog.IsRunningChanged += (s, e) =>
dialog.IsRunningChanged += (_, e) =>
{
if (!e.Value)
{
if (!e.Value)
{
buttonPressedLabel.Text = $"{clicked}";
}
};
}
catch (FormatException)
{
buttonPressedLabel.Text = "Invalid Options";
}
buttonPressedLabel.Text = $"{clicked}";
}
};
return dialog;
}
public override List<Key> GetDemoKeyStrokes ()
{
var keys = new List<Key> ();
List<Key> keys =
[
Key.D6,
Key.D5,
Key.Tab,
Key.D2,
Key.D0,
Key.Enter
];
keys.Add (Key.D6);
keys.Add (Key.D5);
keys.Add (Key.Tab);
keys.Add (Key.D2);
keys.Add (Key.D0);
keys.Add (Key.Enter);
for (int i = 0; i < 5; i++)
{
keys.Add (Key.A);

2
Examples/UICatalog/Scenarios/EditorsAndHelpers/AllViewsView.cs
View File

@@ -17,7 +17,7 @@ public class AllViewsView : View
{
if (sender is View sendingView)
{
sendingView.SetContentSize (new Size (sendingView.Viewport.Width, sendingView.GetHeightRequiredForSubViews ()));
sendingView.SetContentSize (new Size (sendingView.Viewport.Width, sendingView.GetHeightRequiredForSubViews ()));
}
};

26
Terminal.Gui/ViewBase/Layout/DimAuto.cs
View File

@@ -73,7 +73,7 @@ public record DimAuto (Dim? MaximumContentDim, Dim? MinimumContentDim, DimAutoSt
{
maxCalculatedSize = textSize;
if (us is { ContentSizeTracksViewport: false, InternalSubViews.Count: 0 })
if (us is { ContentSizeTracksViewport: false, } && us.GetSubViews (includePadding: true).Count == 0)
{
// ContentSize was explicitly set. Use `us.ContentSize` to determine size.
maxCalculatedSize = dimension == Dimension.Width ? us.GetContentSize ().Width : us.GetContentSize ().Height;
@@ -82,7 +82,7 @@ public record DimAuto (Dim? MaximumContentDim, Dim? MinimumContentDim, DimAutoSt
{
// TOOD: All the below is a naive implementation. It may be possible to optimize this.
List<View> includedSubViews = us.SubViews.Snapshot ().ToList ();
List<View> includedSubViews = us.GetSubViews (includePadding: true).ToList ();
// If [x] it can cause `us.ContentSize` to change.
// If [ ] it doesn't need special processing for us to determine `us.ContentSize`.
@@ -130,11 +130,10 @@ public record DimAuto (Dim? MaximumContentDim, Dim? MinimumContentDim, DimAutoSt
if (dimension == Dimension.Width)
{
notDependentSubViews = includedSubViews.Where (
v => v.Width is { }
&& (v.X is PosAbsolute or PosFunc
|| v.Width is DimAuto
or DimAbsolute
or DimFunc) // BUGBUG: We should use v.X.Has and v.Width.Has?
v => (v.X is PosAbsolute or PosFunc
|| v.Width is DimAuto
or DimAbsolute
or DimFunc) // BUGBUG: We should use v.X.Has and v.Width.Has?
&& !v.X.Has<PosAnchorEnd> (out _)
&& !v.X.Has<PosAlign> (out _)
&& !v.X.Has<PosCenter> (out _)
@@ -146,11 +145,10 @@ public record DimAuto (Dim? MaximumContentDim, Dim? MinimumContentDim, DimAutoSt
else
{
notDependentSubViews = includedSubViews.Where (
v => v.Height is { }
&& (v.Y is PosAbsolute or PosFunc
|| v.Height is DimAuto
or DimAbsolute
or DimFunc) // BUGBUG: We should use v.Y.Has and v.Height.Has?
v => (v.Y is PosAbsolute or PosFunc
|| v.Height is DimAuto
or DimAbsolute
or DimFunc) // BUGBUG: We should use v.Y.Has and v.Height.Has?
&& !v.Y.Has<PosAnchorEnd> (out _)
&& !v.Y.Has<PosAlign> (out _)
&& !v.Y.Has<PosCenter> (out _)
@@ -198,11 +196,11 @@ public record DimAuto (Dim? MaximumContentDim, Dim? MinimumContentDim, DimAutoSt
if (dimension == Dimension.Width)
{
centeredSubViews = us.InternalSubViews.Where (v => v.X.Has<PosCenter> (out _)).ToList ();
centeredSubViews = us.GetSubViews (includePadding: true).Where (v => v.X.Has<PosCenter> (out _)).ToList ();
}
else
{
centeredSubViews = us.InternalSubViews.Where (v => v.Y.Has<PosCenter> (out _)).ToList ();
centeredSubViews = us.GetSubViews (includePadding: true).Where (v => v.Y.Has<PosCenter> (out _)).ToList ();
}
viewsNeedingLayout.AddRange (centeredSubViews);

32
Terminal.Gui/ViewBase/View.Content.cs
View File

@@ -77,10 +77,10 @@ public partial class View
/// If the content size was not explicitly set by <see cref="SetContentSize"/>, <see cref="GetContentSize ()"/> will
/// return the size of the <see cref="Viewport"/> and <see cref="ContentSizeTracksViewport"/> will be <see langword="true"/>.
/// </returns>
public Size GetContentSize () { return _contentSize ?? Viewport.Size; }
public Size GetContentSize () => _contentSize ?? Viewport.Size;
/// <summary>
/// Gets the number of rows required for all the View's SubViews.
/// Gets the number of columns required for all the View's SubViews.
/// </summary>
/// <returns></returns>
public int GetWidthRequiredForSubViews ()
@@ -98,20 +98,10 @@ public partial class View
max = Viewport.Width;
}
// Iterate through all subviews to calculate the maximum height
foreach (View subView in InternalSubViews)
// Iterate through all subviews to calculate the maximum width
foreach (View subView in GetSubViews(includePadding:true))
{
if (subView.Width is { })
{
//if (subView.Height is DimAbsolute)
//{
// max = Math.Max (max, subView.Height.GetAnchor (0));
//}
//else
{
max = Math.Max (max, subView.X.GetAnchor (0) + subView.Width.Calculate (0, max, subView, Dimension.Width));
}
}
max = Math.Max (max, subView.X.GetAnchor (0) + subView.Width.Calculate (0, max, subView, Dimension.Width));
}
// Return the calculated maximum content size
@@ -140,17 +130,7 @@ public partial class View
// Iterate through all subviews to calculate the maximum height
foreach (View subView in InternalSubViews)
{
if (subView.Height is { })
{
//if (subView.Height is DimAbsolute)
//{
// max = Math.Max (max, subView.Height.GetAnchor (0));
//}
//else
{
max = Math.Max (max, subView.Y.GetAnchor (0) + subView.Height.Calculate (0, max, subView, Dimension.Height));
}
}
max = Math.Max (max, subView.Y.GetAnchor (0) + subView.Height.Calculate (0, max, subView, Dimension.Height));
}
// Return the calculated maximum content size

2
Terminal.Gui/ViewBase/View.Drawing.cs
View File

@@ -490,7 +490,7 @@ public partial class View // Drawing APIs
/// <param name="context">The draw context to report drawn areas to.</param>
public void DrawText (DrawContext? context = null)
{
var drawRect = new Rectangle (ContentToScreen (Point.Empty), GetContentSize ());
Rectangle drawRect = new Rectangle (ContentToScreen (Point.Empty), GetContentSize ());
// Use GetDrawRegion to get precise drawn areas
Region textRegion = TextFormatter.GetDrawRegion (drawRect);

2
Terminal.Gui/ViewBase/View.Layout.cs
View File

@@ -1114,7 +1114,7 @@ public partial class View // Layout APIs
/// the SuperView's <see cref="GetContentSize ()"/>) or the screen size if there's no SuperView.
/// </summary>
/// <returns></returns>
private Size GetContainerSize ()
public Size GetContainerSize ()
{
// TODO: Get rid of refs to Top
Size superViewContentSize = SuperView?.GetContentSize ()

6
Terminal.Gui/ViewBase/View.Text.cs
View File

@@ -180,10 +180,8 @@ public partial class View // Text Property APIs
Size? size = _contentSize;
// Use _width & _height instead of Width & Height to avoid debug spew
var widthAuto = _width as DimAuto;
var heightAuto = _height as DimAuto;
if (widthAuto is { } && widthAuto.Style.FastHasFlags (DimAutoStyle.Text))
if (_width is DimAuto { } widthAuto && widthAuto.Style.FastHasFlags (DimAutoStyle.Text))
{
TextFormatter.ConstrainToWidth = null;
}
@@ -195,6 +193,8 @@ public partial class View // Text Property APIs
}
}
// Use _width & _height instead of Width & Height to avoid debug spew
DimAuto? heightAuto = _height as DimAuto;
if (heightAuto is { } && heightAuto.Style.FastHasFlags (DimAutoStyle.Text))
{
TextFormatter.ConstrainToHeight = null;

124
Terminal.Gui/Views/Dialog.cs
View File

@@ -12,7 +12,7 @@ namespace Terminal.Gui.Views;
/// or when one of the views or buttons added to the dialog calls
/// <see cref="IApplication.RequestStop()"/>.
/// </remarks>
public class Dialog : Window
public class Dialog : Window, IDesignable
{
/// <summary>
/// Defines the default border styling for <see cref="Dialog"/>. Can be configured via
@@ -36,14 +36,14 @@ public class Dialog : Window
/// <see cref="ConfigurationManager"/>.
/// </summary>
[ConfigurationProperty (Scope = typeof (ThemeScope))]
public static int DefaultMinimumHeight { get; set; } = 80;
public static int DefaultMinimumHeight { get; set; } = 50;
/// <summary>
/// Defines the default minimum Dialog width, as a percentage of the container width. Can be configured via
/// <see cref="ConfigurationManager"/>.
/// </summary>
[ConfigurationProperty (Scope = typeof (ThemeScope))]
public static int DefaultMinimumWidth { get; set; } = 80;
public static int DefaultMinimumWidth { get; set; } = 50;
/// <summary>
/// Gets or sets whether all <see cref="Window"/>s are shown with a shadow effect by default.
@@ -61,19 +61,16 @@ public class Dialog : Window
/// </remarks>
public Dialog ()
{
Arrangement = ViewArrangement.Movable | ViewArrangement.Overlapped;
base.ShadowStyle = DefaultShadow;
BorderStyle = DefaultBorderStyle;
X = Pos.Center ();
Y = Pos.Center ();
Width = Dim.Auto (DimAutoStyle.Auto, Dim.Percent (DefaultMinimumWidth), Dim.Percent (90));
Height = Dim.Auto (DimAutoStyle.Auto, Dim.Percent (DefaultMinimumHeight), Dim.Percent (90));
SchemeName = SchemeManager.SchemesToSchemeName (Schemes.Dialog);
Width = Dim.Auto (minimumContentDim: Dim.Func (_ => Math.Max (Dim.Percent (DefaultMinimumWidth).GetAnchor(GetContainerSize().Width), GetWidthRequiredForSubViews ())), maximumContentDim: Dim.Percent (90));
Height = Dim.Auto (minimumContentDim: Dim.Func (_ => Math.Max (Dim.Percent (DefaultMinimumHeight).GetAnchor (GetContainerSize ().Height), GetHeightRequiredForSubViews ())), maximumContentDim: Dim.Percent (90));
ButtonAlignment = DefaultButtonAlignment;
ButtonAlignmentModes = DefaultButtonAlignmentModes;
SetStyle ();
}
private readonly List<Button> _buttons = [];
@@ -81,8 +78,10 @@ public class Dialog : Window
private bool _canceled;
/// <summary>
/// Adds a <see cref="Button"/> to the <see cref="Dialog"/>, its layout will be controlled by the
/// <see cref="Dialog"/>
/// Adds a <see cref="Button"/> to the bottom of the <see cref="Dialog"/>. The lifetime and layout will be controlled by the
/// <see cref="Dialog"/>. The added buttons will be aligned according to the <see cref="ButtonAlignment"/> and
/// <see cref="ButtonAlignmentModes"/>. The last button to be added will be the right-most button and will be treated as
/// the default (<see cref="Button.IsDefault"/> will be set to true).
/// </summary>
/// <param name="button">Button to add.</param>
public void AddButton (Button button)
@@ -91,18 +90,20 @@ public class Dialog : Window
button.X = Pos.Align (ButtonAlignment, ButtonAlignmentModes, GetHashCode ());
button.Y = Pos.AnchorEnd ();
_buttons.Add (button);
foreach (Button b in _buttons)
{
b.IsDefault = false;
}
button.IsDefault = true;
// Subscribe to FrameChanged to update padding dynamically
button.FrameChanged += ButtonFrameChanged;
_buttons.Add (button);
// Add to Padding if it exists and EndInit has been called, otherwise add to the Dialog
if (Padding is { })
{
Padding.Add (button);
UpdatePaddingBottom ();
}
Padding!.Add (button);
}
private void ButtonFrameChanged (object? sender, EventArgs e) { UpdatePaddingBottom (); }
// TODO: Update button.X = Pos.Justify when alignment changes
@@ -144,6 +145,36 @@ public class Dialog : Window
}
}
/// <inheritdoc/>
protected override void OnIsRunningChanged (bool newIsModal)
{
SetStyle ();
base.OnIsRunningChanged (newIsModal);
}
private void SetStyle ()
{
if (IsRunning)
{
SchemeName = SchemeManager.SchemesToSchemeName (Schemes.Dialog);
Padding?.SetScheme (SchemeManager.GetScheme (Schemes.Base));
BorderStyle = DefaultBorderStyle;
Arrangement |= ViewArrangement.Movable | ViewArrangement.Resizable | ViewArrangement.Overlapped;
base.ShadowStyle = DefaultShadow;
}
else
{
SchemeName = SchemeManager.SchemesToSchemeName (Schemes.Base);
Padding?.SetScheme (SchemeManager.GetScheme (Schemes.Dialog));
BorderStyle = LineStyle.Dotted;
// strip out movable and resizable
Arrangement &= ~(ViewArrangement.Movable | ViewArrangement.Resizable);
base.ShadowStyle = ShadowStyle.None;
}
}
// Dialogs are Modal and Focus is indicated by their Border. The following code ensures the
// Text of the dialog (e.g. for a MessageBox) is always drawn using the Normal Attribute
// instead of the Focus attribute.
@@ -163,6 +194,11 @@ public class Dialog : Window
/// <inheritdoc/>
protected override bool OnGettingAttributeForRole (in VisualRole role, ref Attribute currentAttribute)
{
if (!IsRunning)
{
return false;
}
if (!_drawingText || role is not VisualRole.Focus || Border?.Thickness == Thickness.Empty)
{
return false;
@@ -182,7 +218,7 @@ public class Dialog : Window
}
// Find the maximum button height
var maxHeight = 1; // Default to minimum height of 1 for buttons
var maxHeight = 1; // Default to minimum height of 1 for buttons (assuming no shadow)
foreach (Button button in _buttons)
{
@@ -193,13 +229,57 @@ public class Dialog : Window
}
// Set the bottom padding to match button height
// Update padding if buttons have been laid out (maxHeight > 1) or if padding hasn't been initialized yet
// Update padding if buttons have been laid out (maxHeight > 1)
if (maxHeight > 1 || Padding.Thickness.Bottom == 0)
{
Padding.Thickness = Padding.Thickness with { Bottom = maxHeight };
}
}
bool IDesignable.EnableForDesign ()
{
Title = "Dialog Title";
Button btnCancel = new ()
{
Title = Strings.btnCancel,
};
btnCancel.Accepting += (s, e) =>
{
if (!IsRunning)
{
return;
}
(s as View)!.App?.RequestStop ();
e.Handled = true;
};
AddButton (btnCancel);
AddButton (new ()
{
Title = Strings.btnOk,
// Dialog will automatically set IsDefault to the last button added
});
// Add some example content to the dialog
Label infoLabel = new ()
{
Text = "_Example:"
};
TextField info = new ()
{
X = Pos.Right (infoLabel) + 1,
Y = Pos.Top (infoLabel),
Text = "Type and press ENTER to accept.",
Width = 40
};
Add (infoLabel, info);
return true;
}
/// <inheritdoc/>
protected override void Dispose (bool disposing)
{

18
Terminal.Gui/Views/MessageBox.cs
View File

@@ -57,8 +57,8 @@ public static class MessageBox
{
private static LineStyle _defaultBorderStyle = LineStyle.Heavy; // Resources/config.json overrides
private static Alignment _defaultButtonAlignment = Alignment.Center; // Resources/config.json overrides
private static int _defaultMinimumWidth = 0; // Resources/config.json overrides
private static int _defaultMinimumHeight = 0; // Resources/config.json overrides
private static int _defaultMinimumWidth = 10; // Resources/config.json overrides
private static int _defaultMinimumHeight = 10; // Resources/config.json overrides
/// <summary>
/// Defines the default border styling for <see cref="MessageBox"/>. Can be configured via
@@ -92,7 +92,7 @@ public static class MessageBox
}
/// <summary>
/// Defines the default minimum Dialog height, as a percentage of the screen width. Can be configured via
/// Defines the default minimum Dialog height, as a percentage of the screen height. Can be configured via
/// <see cref="ConfigurationManager"/>.
/// </summary>
[ConfigurationProperty (Scope = typeof (ThemeScope))]
@@ -622,16 +622,8 @@ public static class MessageBox
Buttons = buttonList.ToArray ()
};
// ReSharper disable AccessToDisposedClosure
dialog.Width = Dim.Auto (
DimAutoStyle.Auto,
Dim.Func (_ => (int)((app.Screen.Width - dialog.GetAdornmentsThickness ().Horizontal) * (DefaultMinimumWidth / 100f))),
Dim.Func (_ => (int)((app.Screen.Width - dialog.GetAdornmentsThickness ().Horizontal) * 0.9f)));
dialog.Height = Dim.Auto (
DimAutoStyle.Auto,
Dim.Func (_ => (int)((app.Screen.Height - dialog.GetAdornmentsThickness ().Vertical) * (DefaultMinimumHeight / 100f))),
Dim.Func (_ => (int)((app.Screen.Height - dialog.GetAdornmentsThickness ().Vertical) * 0.9f)));
dialog.Width = Dim.Auto (minimumContentDim: Dim.Func (_ => Math.Max (Dim.Percent (DefaultMinimumWidth).GetAnchor (dialog.GetContainerSize ().Width), dialog.GetWidthRequiredForSubViews ())), maximumContentDim: Dim.Percent (90));
dialog.Height = Dim.Auto (minimumContentDim: Dim.Func (_ => Math.Max (Dim.Percent (DefaultMinimumHeight).GetAnchor (dialog.GetContainerSize ().Height), dialog.GetHeightRequiredForSubViews ())), maximumContentDim: Dim.Percent (90));
if (width != 0)
{

2
Tests/UnitTestsParallelizable/ViewBase/ArrangementTests.cs
View File

@@ -694,7 +694,7 @@ public class ArrangementTests (ITestOutputHelper output)
Assert.True (window.Arrangement.HasFlag (ViewArrangement.Overlapped));
}
[Fact]
[Fact (Skip = "need to test with IsRunnable true")]
public void Dialog_DefaultsToMovableAndOverlapped ()
{
var dialog = new Dialog ();