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

Prevents HotKeySpecifier being negative.

Browse Source
This commit is contained in:
BDisp
2022-06-17 15:51:47 +01:00
committed by Tig Kindel
parent 5b35b0a842
commit 0b040a383c
2 changed files with 94 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Terminal.Gui/Views/Checkbox.cs
View File

@@ -114,7 +114,8 @@ namespace Terminal.Gui {
break;
}
int w = TextFormatter.Size.Width - (TextFormatter.Text.Contains (HotKeySpecifier) ? 1 : 0);
int w = TextFormatter.Size.Width - (TextFormatter.Text.Contains (HotKeySpecifier)
? Math.Max (Rune.ColumnWidth (HotKeySpecifier), 0) : 0);
GetCurrentWidth (out int cWidth);
var canSetWidth = SetWidth (w, out int rWidth);
if (canSetWidth && (cWidth < rWidth || AutoSize)) {

92
UnitTests/CheckboxTests.cs
View File

@@ -374,5 +374,97 @@ namespace Terminal.Gui.Views {
pos = GraphViewTests.AssertDriverContentsWithFrameAre (expected, output);
Assert.Equal (new Rect (0, 0, 30, 5), pos);
}
[Fact, AutoInitShutdown]
public void AutoSize_Stays_True_AnchorEnd_Without_HotKeySpecifier ()
{
var checkBox = new CheckBox () {
Y = Pos.Center (),
Text = "Check this out 你"
};
checkBox.X = Pos.AnchorEnd () - Pos.Function (() => checkBox.GetTextFormatterBoundsSize ().Width);
var win = new Window () {
Width = Dim.Fill (),
Height = Dim.Fill (),
Title = "Test Demo 你"
};
win.Add (checkBox);
Application.Top.Add (win);
Assert.True (checkBox.AutoSize);
Application.Begin (Application.Top);
((FakeDriver)Application.Driver).SetBufferSize (30, 5);
var expected = @"
┌ Test Demo 你 ──────────────┐
│ │
│ ╴ Check this out 你│
│ │
└────────────────────────────┘
";
GraphViewTests.AssertDriverContentsWithFrameAre (expected, output);
Assert.True (checkBox.AutoSize);
checkBox.Text = "Check this out 你 changed";
Assert.True (checkBox.AutoSize);
Application.Refresh ();
expected = @"
┌ Test Demo 你 ──────────────┐
│ │
│ ╴ Check this out 你 changed│
│ │
└────────────────────────────┘
";
GraphViewTests.AssertDriverContentsWithFrameAre (expected, output);
}
[Fact, AutoInitShutdown]
public void AutoSize_Stays_True_AnchorEnd_With_HotKeySpecifier ()
{
var checkBox = new CheckBox () {
Y = Pos.Center (),
Text = "C_heck this out 你"
};
checkBox.X = Pos.AnchorEnd () - Pos.Function (() => checkBox.GetTextFormatterBoundsSize ().Width);
var win = new Window () {
Width = Dim.Fill (),
Height = Dim.Fill (),
Title = "Test Demo 你"
};
win.Add (checkBox);
Application.Top.Add (win);
Assert.True (checkBox.AutoSize);
Application.Begin (Application.Top);
((FakeDriver)Application.Driver).SetBufferSize (30, 5);
var expected = @"
┌ Test Demo 你 ──────────────┐
│ │
│ ╴ Check this out 你│
│ │
└────────────────────────────┘
";
GraphViewTests.AssertDriverContentsWithFrameAre (expected, output);
Assert.True (checkBox.AutoSize);
checkBox.Text = "Check this out 你 changed";
Assert.True (checkBox.AutoSize);
Application.Refresh ();
expected = @"
┌ Test Demo 你 ──────────────┐
│ │
│ ╴ Check this out 你 changed│
│ │
└────────────────────────────┘
";
GraphViewTests.AssertDriverContentsWithFrameAre (expected, output);
}
}
}