Git_Mirror/Terminal.Gui
1
0
Fork 0
mirror of https://github.com/gui-cs/Terminal.Gui.git synced 2026-01-01 00:46:39 +01:00
Code Issues Packages Projects Releases Wiki Activity

fixed #504 and updated tests

Browse Source
This commit is contained in:
Charlie Kindel
2020-06-09 14:51:02 -06:00
parent bfcbd3cb0d
commit d5dd29dbda
4 changed files with 371 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
Terminal.Gui/Views/Button.cs
View File

@@ -62,7 +62,7 @@ namespace Terminal.Gui {
/// The width of the <see cref="Button"/> is computed based on the
/// text length. The height will always be 1.
/// </remarks>
public Button () : this (string.Empty) { }
public Button () : this (text: string.Empty, is_default: false) { }
/// <summary>
/// Initializes a new instance of <see cref="Button"/> using <see cref="LayoutStyle.Computed"/> layout.
@@ -78,11 +78,7 @@ namespace Terminal.Gui {
/// </param>
public Button (ustring text, bool is_default = false) : base ()
{
CanFocus = true;
Text = text ?? string.Empty;
this.IsDefault = is_default;
int w = SetWidthHeight (text, is_default);
Frame = new Rect (Frame.Location, new Size (w, 1));
Init (text, is_default);
}
/// <summary>
@@ -114,9 +110,26 @@ namespace Terminal.Gui {
public Button (int x, int y, ustring text, bool is_default)
: base (new Rect (x, y, text.Length + 4 + (is_default ? 2 : 0), 1))
{
Init (text, is_default);
}
Rune _leftBracket;
Rune _rightBracket;
Rune _leftDefault;
Rune _rightDefault;
void Init (ustring text, bool is_default)
{
_leftBracket = new Rune (Driver != null ? Driver.LeftBracket : '[');
_rightBracket = new Rune (Driver != null ? Driver.RightBracket : ']');
_leftDefault = new Rune (Driver != null ? Driver.LeftDefaultIndicator : '<');
_rightDefault = new Rune (Driver != null ? Driver.RightDefaultIndicator : '>');
CanFocus = true;
Text = text ?? string.Empty;
this.IsDefault = is_default;
int w = SetWidthHeight (text, is_default);
Frame = new Rect (Frame.Location, new Size (w, 1));
}
int SetWidthHeight (ustring text, bool is_default)
@@ -154,11 +167,6 @@ namespace Terminal.Gui {
}
}
Rune _leftBracket = new Rune (Driver.LeftBracket);
Rune _rightBracket = new Rune (Driver.RightBracket);
Rune _leftDefault = new Rune (Driver.LeftDefaultIndicator);
Rune _rightDefault = new Rune (Driver.RightDefaultIndicator);
internal void Update ()
{
if (IsDefault)