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

Rebased onto bounds-contentarea and merged -broke

Browse Source
This commit is contained in:
Tig
2024-04-14 21:52:45 -06:00
parent 012e7a376a 843b7583c3
commit 8da54ad41d
14 changed files with 2181 additions and 1014 deletions
Download Patch File Download Diff File Expand all files Collapse all files

140
UnitTests/View/Text/AutoSizeTrueTests.cs
View File

@@ -930,31 +930,31 @@ public class AutoSizeTrueTests
Application.Begin (top);
((FakeDriver)Application.Driver).SetBufferSize (10, 4);
Size size = view.GetAutoSize ();
Assert.Equal (new (text.Length, 1), size);
Size size = view.GetTextAutoSize();
Assert.Equal (new Size (text.Length, 1), size);
view.Text = $"{text}\n{text}";
size = view.GetAutoSize ();
Assert.Equal (new (text.Length, 2), size);
size = view.GetTextAutoSize();
Assert.Equal (new Size (text.Length, 2), size);
view.Text = $"{text}\n{text}\n{text}+";
size = view.GetAutoSize ();
Assert.Equal (new (text.Length + 1, 3), size);
size = view.GetTextAutoSize();
Assert.Equal (new Size (text.Length + 1, 3), size);
text = string.Empty;
view.Text = text;
size = view.GetAutoSize ();
Assert.Equal (Size.Empty, size);
size = view.GetTextAutoSize();
Assert.Equal (new Size (0, 0), size);
text = "1";
view.Text = text;
size = view.GetAutoSize ();
Assert.Equal (_size1x1, size);
size = view.GetTextAutoSize();
Assert.Equal (new Size (1, 1), size);
text = "界";
view.Text = text;
size = view.GetAutoSize ();
Assert.Equal (new (2, 1), size);
size = view.GetTextAutoSize();
Assert.Equal (new Size (2, 1), size);
}
[Fact]
@@ -970,31 +970,31 @@ public class AutoSizeTrueTests
Application.Begin (top);
((FakeDriver)Application.Driver).SetBufferSize (10, 4);
Size size = view.GetAutoSize ();
Assert.Equal (new (text.Length, 1), size);
Size size = view.GetTextAutoSize();
Assert.Equal (new Size (text.Length, 1), size);
view.Text = $"{text}\n{text}";
size = view.GetAutoSize ();
Assert.Equal (new (text.Length, 2), size);
size = view.GetTextAutoSize();
Assert.Equal (new Size (text.Length, 2), size);
view.Text = $"{text}\n{text}\n{text}+";
size = view.GetAutoSize ();
Assert.Equal (new (text.Length + 1, 3), size);
size = view.GetTextAutoSize();
Assert.Equal (new Size (text.Length + 1, 3), size);
text = string.Empty;
view.Text = text;
size = view.GetAutoSize ();
Assert.Equal (Size.Empty, size);
size = view.GetTextAutoSize();
Assert.Equal (new Size (0, 0), size);
text = "1";
view.Text = text;
size = view.GetAutoSize ();
Assert.Equal (_size1x1, size);
size = view.GetTextAutoSize();
Assert.Equal (new Size (1, 1), size);
text = "界";
view.Text = text;
size = view.GetAutoSize ();
Assert.Equal (new (2, 1), size);
size = view.GetTextAutoSize();
Assert.Equal (new Size (2, 1), size);
}
[Fact]
@@ -1010,31 +1010,31 @@ public class AutoSizeTrueTests
Application.Begin (top);
((FakeDriver)Application.Driver).SetBufferSize (10, 4);
Size size = view.GetAutoSize ();
Assert.Equal (new (text.Length, 1), size);
Size size = view.GetTextAutoSize();
Assert.Equal (new Size (text.Length, 1), size);
view.Text = $"{text}\n{text}";
size = view.GetAutoSize ();
Assert.Equal (new (text.Length, 2), size);
size = view.GetTextAutoSize();
Assert.Equal (new Size (text.Length, 2), size);
view.Text = $"{text}\n{text}\n{text}+";
size = view.GetAutoSize ();
Assert.Equal (new (text.Length + 1, 3), size);
size = view.GetTextAutoSize();
Assert.Equal (new Size (text.Length + 1, 3), size);
text = string.Empty;
view.Text = text;
size = view.GetAutoSize ();
Assert.Equal (Size.Empty, size);
size = view.GetTextAutoSize();
Assert.Equal (new Size (0, 0), size);
text = "1";
view.Text = text;
size = view.GetAutoSize ();
Assert.Equal (_size1x1, size);
size = view.GetTextAutoSize();
Assert.Equal (new Size (1, 1), size);
text = "界";
view.Text = text;
size = view.GetAutoSize ();
Assert.Equal (new (2, 1), size);
size = view.GetTextAutoSize();
Assert.Equal (new Size (2, 1), size);
}
[Fact]
@@ -1050,31 +1050,31 @@ public class AutoSizeTrueTests
Application.Begin (top);
((FakeDriver)Application.Driver).SetBufferSize (10, 4);
Size size = view.GetAutoSize ();
Assert.Equal (new (text.Length, 1), size);
Size size = view.GetTextAutoSize();
Assert.Equal (new Size (text.Length, 1), size);
view.Text = $"{text}\n{text}";
size = view.GetAutoSize ();
Assert.Equal (new (text.Length, 2), size);
size = view.GetTextAutoSize();
Assert.Equal (new Size (text.Length, 2), size);
view.Text = $"{text}\n{text}\n{text}+";
size = view.GetAutoSize ();
Assert.Equal (new (text.Length + 1, 3), size);
size = view.GetTextAutoSize();
Assert.Equal (new Size (text.Length + 1, 3), size);
text = string.Empty;
view.Text = text;
size = view.GetAutoSize ();
Assert.Equal (Size.Empty, size);
size = view.GetTextAutoSize();
Assert.Equal (new Size (0, 0), size);
text = "1";
view.Text = text;
size = view.GetAutoSize ();
Assert.Equal (_size1x1, size);
size = view.GetTextAutoSize();
Assert.Equal (new Size (1, 1), size);
text = "界";
view.Text = text;
size = view.GetAutoSize ();
Assert.Equal (new (2, 1), size);
size = view.GetTextAutoSize();
Assert.Equal (new Size (2, 1), size);
}
[Fact]
@@ -1090,31 +1090,31 @@ public class AutoSizeTrueTests
Application.Begin (top);
((FakeDriver)Application.Driver).SetBufferSize (10, 4);
Size size = view.GetAutoSize ();
Assert.Equal (new (1, text.Length), size);
Size size = view.GetTextAutoSize();
Assert.Equal (new Size (1, text.Length), size);
view.Text = $"{text}\n{text}";
size = view.GetAutoSize ();
Assert.Equal (new (2, text.Length), size);
size = view.GetTextAutoSize();
Assert.Equal (new Size (2, text.Length), size);
view.Text = $"{text}\n{text}\n{text}+";
size = view.GetAutoSize ();
Assert.Equal (new (3, text.Length + 1), size);
size = view.GetTextAutoSize();
Assert.Equal (new Size (3, text.Length + 1), size);
text = string.Empty;
view.Text = text;
size = view.GetAutoSize ();
Assert.Equal (Size.Empty, size);
size = view.GetTextAutoSize();
Assert.Equal (new Size (0, 0), size);
text = "1";
view.Text = text;
size = view.GetAutoSize ();
Assert.Equal (_size1x1, size);
size = view.GetTextAutoSize();
Assert.Equal (new Size (1, 1), size);
text = "界";
view.Text = text;
size = view.GetAutoSize ();
Assert.Equal (new (2, 1), size);
size = view.GetTextAutoSize();
Assert.Equal (new Size (2, 1), size);
}
[Fact]
@@ -2134,7 +2134,7 @@ Y
[AutoInitShutdown]
public void AutoSize_True_Width_Height_Stay_True_If_TextFormatter_Size_Fit ()
{
var text = "Fi_nish 終";
var text = "Finish 終";
var horizontalView = new View
{
@@ -2159,18 +2159,17 @@ Y
Assert.True (horizontalView.AutoSize);
Assert.True (verticalView.AutoSize);
Assert.Equal (new (text.GetColumns (), 1), horizontalView.TextFormatter.Size);
Assert.Equal (new (2, 9), verticalView.TextFormatter.Size);
Assert.Equal (new (0, 0, 10, 1), horizontalView.Frame);
Assert.Equal (new (0, 3, 10, 9), verticalView.Frame);
Assert.Equal (new (2, 8), verticalView.TextFormatter.Size);
//Assert.Equal (new (0, 0, 10, 1), horizontalView.Frame);
//Assert.Equal (new (0, 3, 10, 9), verticalView.Frame);
var expected = @"
┌────────────────────┐
│Fi_nish 終 │
│Finish 終 │
│ │
│ │
│F │
│i │
│_ │
│n │
│i │
│s │
@@ -2185,27 +2184,27 @@ Y
│ │
│ │
│ │
│ │
└────────────────────┘
";
Rectangle pos = TestHelpers.AssertDriverContentsWithFrameAre (expected, _output);
verticalView.Text = "最初_の行二行目";
verticalView.Text = "最初の行二行目";
Application.Top.Draw ();
Assert.True (horizontalView.AutoSize);
Assert.True (verticalView.AutoSize);
// height was initialized with 8 and can only grow or keep initial value
Assert.Equal (new Rectangle (0, 3, 10, 9), verticalView.Frame);
Assert.Equal (new Rectangle (0, 3, 9, 8), verticalView.Frame);
expected = @"
┌────────────────────┐
│Fi_nish 終 │
│Finish 終 │
│ │
│ │
│最 │
│初 │
│_ │
│の │
│行 │
│二 │
@@ -2220,6 +2219,7 @@ Y
│ │
│ │
│ │
│ │
└────────────────────┘
";