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

Fixes #3017. View TextDirection returns incorrect size on a vertical direction instance with AutoSize as false.

Browse Source
This commit is contained in:
BDisp
2023-11-28 21:16:47 +00:00
parent 42b9ad1d61
commit 5c978603e2
10 changed files with 247 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
UnitTests/Text/TextFormatterTests.cs
View File

@@ -26,6 +26,10 @@ namespace Terminal.Gui.TextTests {
var tf = new TextFormatter ();
tf.Text = testText;
// Direction wasn't set yet and need to be set first
Assert.Equal ((TextDirection)(-1), tf.Direction);
Assert.Equal (Size.Empty, tf.Size);
tf.Direction = TextDirection.LeftRight_TopBottom;
expectedSize = new Size (testText.Length, 1);
Assert.Equal (testText, tf.Text);
Assert.Equal (TextAlignment.Left, tf.Alignment);
@@ -190,6 +194,48 @@ namespace Terminal.Gui.TextTests {
}
}
[Theory]
[InlineData (TextAlignment.Left, false)]
[InlineData (TextAlignment.Centered, true)]
[InlineData (TextAlignment.Right, false)]
[InlineData (TextAlignment.Justified, true)]
public void TestSize_DirectionChange_AutoSize_True_Or_False_Horizontal (TextAlignment textAlignment, bool autoSize)
{
var tf = new TextFormatter () { Direction = TextDirection.LeftRight_TopBottom, Text = "你你", Alignment = textAlignment, AutoSize = autoSize };
Assert.Equal (4, tf.Size.Width);
Assert.Equal (1, tf.Size.Height);
tf.Direction = TextDirection.TopBottom_LeftRight;
if (autoSize && textAlignment != TextAlignment.Justified) {
Assert.Equal (2, tf.Size.Width);
Assert.Equal (2, tf.Size.Height);
} else {
Assert.Equal (4, tf.Size.Width);
Assert.Equal (1, tf.Size.Height);
}
}
[Theory]
[InlineData (VerticalTextAlignment.Top, false)]
[InlineData (VerticalTextAlignment.Middle, true)]
[InlineData (VerticalTextAlignment.Bottom, false)]
[InlineData (VerticalTextAlignment.Justified, true)]
public void TestSize_DirectionChange_AutoSize_True_Or_False_Vertical (VerticalTextAlignment textAlignment, bool autoSize)
{
var tf = new TextFormatter () { Direction = TextDirection.TopBottom_LeftRight, Text = "你你", VerticalAlignment = textAlignment, AutoSize = autoSize };
Assert.Equal (2, tf.Size.Width);
Assert.Equal (2, tf.Size.Height);
tf.Direction = TextDirection.LeftRight_TopBottom;
if (autoSize && textAlignment != VerticalTextAlignment.Justified) {
Assert.Equal (4, tf.Size.Width);
Assert.Equal (1, tf.Size.Height);
} else {
Assert.Equal (2, tf.Size.Width);
Assert.Equal (2, tf.Size.Height);
}
}
[Fact]
public void NeedsFormat_Sets ()
{