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

Merge branch 'v2_develop' into events

Browse Source
This commit is contained in:
Thomas Nind
2023-03-20 17:07:24 +00:00
committed by GitHub
parent 1be2fddb07 2aca32cd3d
commit 057cea44d2
17 changed files with 344 additions and 230 deletions
Download Patch File Download Diff File Expand all files Collapse all files

106
UnitTests/Core/LayoutTests.cs
View File

@@ -47,8 +47,58 @@ namespace Terminal.Gui.CoreTests {
Assert.Throws<InvalidOperationException> (() => root.LayoutSubviews ());
}
[Fact]
public void LayoutSubviews_No_SuperView ()
{
var root = new View ();
var first = new View () { Id = "first", X = 1, Y = 2, Height = 3, Width = 4 };
root.Add (first);
var second = new View () { Id = "second" };
root.Add (second);
second.X = Pos.Right (first) + 1;
root.LayoutSubviews ();
Assert.Equal (6, second.Frame.X);
}
[Fact]
public void LayoutSubviews_RootHas_SuperView ()
{
var top = new View ();
var root = new View ();
top.Add (root);
var first = new View () { Id = "first", X = 1, Y = 2, Height = 3, Width = 4 };
root.Add (first);
var second = new View () { Id = "second" };
root.Add (second);
second.X = Pos.Right (first) + 1;
root.LayoutSubviews ();
Assert.Equal (6, second.Frame.X);
}
[Fact]
public void LayoutSubviews_ViewThatRefsSuperView_Throws ()
{
var root = new View ();
var super = new View ();
root.Add (super);
var sub = new View ();
super.Add (sub);
super.Width = Dim.Width (sub);
Assert.Throws<InvalidOperationException> (() => root.LayoutSubviews ());
}
[Fact, AutoInitShutdown]
public void SetWidth_CanSetWidth_ForceValidatePosDim ()
public void TrySetWidth_ForceValidatePosDim ()
{
var top = new View () {
X = 0,
@@ -62,15 +112,15 @@ namespace Terminal.Gui.CoreTests {
};
top.Add (v);
Assert.False (v.SetWidth (70, out int rWidth));
Assert.False (v.TrySetWidth (70, out int rWidth));
Assert.Equal (70, rWidth);
v.Width = Dim.Fill (1);
Assert.False (v.SetWidth (70, out rWidth));
Assert.False (v.TrySetWidth (70, out rWidth));
Assert.Equal (69, rWidth);
v.Width = null;
Assert.True (v.SetWidth (70, out rWidth));
Assert.True (v.TrySetWidth (70, out rWidth));
Assert.Equal (70, rWidth);
Assert.False (v.IsInitialized);
@@ -82,12 +132,12 @@ namespace Terminal.Gui.CoreTests {
Assert.Throws<ArgumentException> (() => v.Width = 75);
v.LayoutStyle = LayoutStyle.Absolute;
v.Width = 75;
Assert.True (v.SetWidth (60, out rWidth));
Assert.True (v.TrySetWidth (60, out rWidth));
Assert.Equal (60, rWidth);
}
[Fact, AutoInitShutdown]
public void SetHeight_CanSetHeight_ForceValidatePosDim ()
public void TrySetHeight_ForceValidatePosDim ()
{
var top = new View () {
X = 0,
@@ -101,15 +151,15 @@ namespace Terminal.Gui.CoreTests {
};
top.Add (v);
Assert.False (v.SetHeight (10, out int rHeight));
Assert.False (v.TrySetHeight (10, out int rHeight));
Assert.Equal (10, rHeight);
v.Height = Dim.Fill (1);
Assert.False (v.SetHeight (10, out rHeight));
Assert.False (v.TrySetHeight (10, out rHeight));
Assert.Equal (9, rHeight);
v.Height = null;
Assert.True (v.SetHeight (10, out rHeight));
Assert.True (v.TrySetHeight (10, out rHeight));
Assert.Equal (10, rHeight);
Assert.False (v.IsInitialized);
@@ -122,12 +172,12 @@ namespace Terminal.Gui.CoreTests {
Assert.Throws<ArgumentException> (() => v.Height = 15);
v.LayoutStyle = LayoutStyle.Absolute;
v.Height = 15;
Assert.True (v.SetHeight (5, out rHeight));
Assert.True (v.TrySetHeight (5, out rHeight));
Assert.Equal (5, rHeight);
}
[Fact]
public void GetCurrentWidth_CanSetWidth ()
public void GetCurrentWidth_TrySetWidth ()
{
var top = new View () {
X = 0,
@@ -139,23 +189,27 @@ namespace Terminal.Gui.CoreTests {
Width = Dim.Fill ()
};
top.Add (v);
top.LayoutSubviews ();
Assert.False (v.AutoSize);
Assert.True (v.GetCurrentWidth (out int cWidth));
Assert.Equal (80, cWidth);
Assert.True (v.TrySetWidth (0, out _));
Assert.Equal (80, v.Frame.Width);
v.Width = Dim.Fill (1);
Assert.True (v.GetCurrentWidth (out cWidth));
Assert.Equal (79, cWidth);
top.LayoutSubviews ();
Assert.True (v.TrySetWidth (0, out _));
Assert.Equal (79, v.Frame.Width);
v.AutoSize = true;
top.LayoutSubviews ();
Assert.True (v.GetCurrentWidth (out cWidth));
Assert.Equal (79, cWidth);
Assert.True (v.TrySetWidth (0, out _));
Assert.Equal (79, v.Frame.Width);
}
[Fact]
public void GetCurrentHeight_CanSetHeight ()
public void GetCurrentHeight_TrySetHeight ()
{
var top = new View () {
X = 0,
@@ -167,19 +221,23 @@ namespace Terminal.Gui.CoreTests {
Height = Dim.Fill ()
};
top.Add (v);
top.LayoutSubviews ();
Assert.False (v.AutoSize);
Assert.True (v.GetCurrentHeight (out int cHeight));
Assert.Equal (20, cHeight);
Assert.True (v.TrySetHeight (0, out _));
Assert.Equal (20, v.Frame.Height);
v.Height = Dim.Fill (1);
Assert.True (v.GetCurrentHeight (out cHeight));
Assert.Equal (19, cHeight);
top.LayoutSubviews ();
Assert.True (v.TrySetHeight (0, out _));
Assert.Equal (19, v.Frame.Height);
v.AutoSize = true;
top.LayoutSubviews ();
Assert.True (v.GetCurrentHeight (out cHeight));
Assert.Equal (19, cHeight);
Assert.True (v.TrySetHeight (0, out _));
Assert.Equal (19, v.Frame.Height);
}
[Fact]

34
UnitTests/Core/ViewTests.cs
View File

@@ -2115,7 +2115,7 @@ namespace Terminal.Gui.CoreTests {
}
[Fact]
public void GetTextFormatterBoundsSize_GetBoundsTextFormatterSize_HotKeySpecifier ()
public void GetTextFormatterBoundsSize_GetSizeNeededForText_HotKeySpecifier ()
{
var text = "Say Hello 你";
var horizontalView = new View () { Text = text, AutoSize = true, HotKeySpecifier = '_' };
@@ -2128,17 +2128,17 @@ namespace Terminal.Gui.CoreTests {
Assert.True (horizontalView.AutoSize);
Assert.Equal (new Rect (0, 0, 12, 1), horizontalView.Frame);
Assert.Equal (new Size (12, 1), horizontalView.GetTextFormatterBoundsSize ());
Assert.Equal (new Size (12, 1), horizontalView.GetBoundsTextFormatterSize ());
Assert.Equal (horizontalView.TextFormatter.Size, horizontalView.GetBoundsTextFormatterSize ());
Assert.Equal (horizontalView.Frame.Size, horizontalView.GetTextFormatterBoundsSize ());
Assert.Equal (new Size (12, 1), horizontalView.GetSizeNeededForTextWithoutHotKey ());
Assert.Equal (new Size (12, 1), horizontalView.GetSizeNeededForTextAndHotKey ());
Assert.Equal (horizontalView.TextFormatter.Size, horizontalView.GetSizeNeededForTextAndHotKey ());
Assert.Equal (horizontalView.Frame.Size, horizontalView.GetSizeNeededForTextWithoutHotKey ());
Assert.True (verticalView.AutoSize);
Assert.Equal (new Rect (0, 0, 2, 11), verticalView.Frame);
Assert.Equal (new Size (2, 11), verticalView.GetTextFormatterBoundsSize ());
Assert.Equal (new Size (2, 11), verticalView.GetBoundsTextFormatterSize ());
Assert.Equal (verticalView.TextFormatter.Size, verticalView.GetBoundsTextFormatterSize ());
Assert.Equal (verticalView.Frame.Size, verticalView.GetTextFormatterBoundsSize ());
Assert.Equal (new Size (2, 11), verticalView.GetSizeNeededForTextWithoutHotKey ());
Assert.Equal (new Size (2, 11), verticalView.GetSizeNeededForTextAndHotKey ());
Assert.Equal (verticalView.TextFormatter.Size, verticalView.GetSizeNeededForTextAndHotKey ());
Assert.Equal (verticalView.Frame.Size, verticalView.GetSizeNeededForTextWithoutHotKey ());
text = "Say He_llo 你";
horizontalView.Text = text;
@@ -2146,17 +2146,17 @@ namespace Terminal.Gui.CoreTests {
Assert.True (horizontalView.AutoSize);
Assert.Equal (new Rect (0, 0, 12, 1), horizontalView.Frame);
Assert.Equal (new Size (12, 1), horizontalView.GetTextFormatterBoundsSize ());
Assert.Equal (new Size (13, 1), horizontalView.GetBoundsTextFormatterSize ());
Assert.Equal (horizontalView.TextFormatter.Size, horizontalView.GetBoundsTextFormatterSize ());
Assert.Equal (horizontalView.Frame.Size, horizontalView.GetTextFormatterBoundsSize ());
Assert.Equal (new Size (12, 1), horizontalView.GetSizeNeededForTextWithoutHotKey ());
Assert.Equal (new Size (13, 1), horizontalView.GetSizeNeededForTextAndHotKey ());
Assert.Equal (horizontalView.TextFormatter.Size, horizontalView.GetSizeNeededForTextAndHotKey ());
Assert.Equal (horizontalView.Frame.Size, horizontalView.GetSizeNeededForTextWithoutHotKey ());
Assert.True (verticalView.AutoSize);
Assert.Equal (new Rect (0, 0, 2, 11), verticalView.Frame);
Assert.Equal (new Size (2, 11), verticalView.GetTextFormatterBoundsSize ());
Assert.Equal (new Size (2, 12), verticalView.GetBoundsTextFormatterSize ());
Assert.Equal (verticalView.TextFormatter.Size, verticalView.GetBoundsTextFormatterSize ());
Assert.Equal (verticalView.Frame.Size, verticalView.GetTextFormatterBoundsSize ());
Assert.Equal (new Size (2, 11), verticalView.GetSizeNeededForTextWithoutHotKey ());
Assert.Equal (new Size (2, 12), verticalView.GetSizeNeededForTextAndHotKey ());
Assert.Equal (verticalView.TextFormatter.Size, verticalView.GetSizeNeededForTextAndHotKey ());
Assert.Equal (verticalView.Frame.Size, verticalView.GetSizeNeededForTextWithoutHotKey ());
}
[Fact]