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

Reamed Bounds -> ViewPort to see how it feels

Browse Source
This commit is contained in:
Tig
2024-03-14 07:30:27 -08:00
parent a5b1d6836e
commit f6ff36968e
78 changed files with 610 additions and 610 deletions
Download Patch File Download Diff File Expand all files Collapse all files

58
UnitTests/View/ViewTests.cs
View File

@@ -18,13 +18,13 @@ public class ViewTests
view.DrawContent += (s, e) =>
{
Rectangle savedClip = Application.Driver.Clip;
Application.Driver.Clip = new Rectangle (1, 1, view.Bounds.Width, view.Bounds.Height);
Application.Driver.Clip = new Rectangle (1, 1, view.Viewport.Width, view.Viewport.Height);
for (var row = 0; row < view.Bounds.Height; row++)
for (var row = 0; row < view.Viewport.Height; row++)
{
Application.Driver.Move (1, row + 1);
for (var col = 0; col < view.Bounds.Width; col++)
for (var col = 0; col < view.Viewport.Width; col++)
{
Application.Driver.AddStr ($"{col}");
}
@@ -53,7 +53,7 @@ public class ViewTests
Rectangle pos = TestHelpers.AssertDriverContentsWithFrameAre (expected, _output);
Assert.Equal (new Rectangle (0, 0, 20, 10), pos);
view.Clear (view.Bounds);
view.Clear (view.Viewport);
expected = @"
┌──────────────────┐
@@ -80,13 +80,13 @@ public class ViewTests
view.DrawContent += (s, e) =>
{
Rectangle savedClip = Application.Driver.Clip;
Application.Driver.Clip = new Rectangle (1, 1, view.Bounds.Width, view.Bounds.Height);
Application.Driver.Clip = new Rectangle (1, 1, view.Viewport.Width, view.Viewport.Height);
for (var row = 0; row < view.Bounds.Height; row++)
for (var row = 0; row < view.Viewport.Height; row++)
{
Application.Driver.Move (1, row + 1);
for (var col = 0; col < view.Bounds.Width; col++)
for (var col = 0; col < view.Viewport.Width; col++)
{
Application.Driver.AddStr ($"{col}");
}
@@ -115,7 +115,7 @@ public class ViewTests
Rectangle pos = TestHelpers.AssertDriverContentsWithFrameAre (expected, _output);
Assert.Equal (new Rectangle (0, 0, 20, 10), pos);
view.Clear (view.Bounds);
view.Clear (view.Viewport);
expected = @"
┌──────────────────┐
@@ -248,7 +248,7 @@ At 0,0
view.Frame = new Rectangle (3, 3, 10, 1);
Assert.Equal (new Rectangle (3, 3, 10, 1), view.Frame);
Assert.Equal (LayoutStyle.Absolute, view.LayoutStyle);
Assert.Equal (new Rectangle (0, 0, 10, 1), view.Bounds);
Assert.Equal (new Rectangle (0, 0, 10, 1), view.Viewport);
Assert.Equal (new Rectangle (0, 0, 10, 1), view._needsDisplayRect);
top.Draw ();
@@ -297,7 +297,7 @@ At 0,0
view.Width = 10;
view.Height = 1;
Assert.Equal (new Rectangle (3, 3, 10, 1), view.Frame);
Assert.Equal (new Rectangle (0, 0, 10, 1), view.Bounds);
Assert.Equal (new Rectangle (0, 0, 10, 1), view.Viewport);
Assert.Equal (new Rectangle (0, 0, 30, 2), view._needsDisplayRect);
top.Draw ();
@@ -344,7 +344,7 @@ At 0,0
view.Frame = new Rectangle (1, 1, 10, 1);
Assert.Equal (new Rectangle (1, 1, 10, 1), view.Frame);
Assert.Equal (LayoutStyle.Absolute, view.LayoutStyle);
Assert.Equal (new Rectangle (0, 0, 10, 1), view.Bounds);
Assert.Equal (new Rectangle (0, 0, 10, 1), view.Viewport);
Assert.Equal (new Rectangle (0, 0, 10, 1), view._needsDisplayRect);
top.Draw ();
@@ -391,7 +391,7 @@ At 0,0
view.Width = 10;
view.Height = 1;
Assert.Equal (new Rectangle (1, 1, 10, 1), view.Frame);
Assert.Equal (new Rectangle (0, 0, 10, 1), view.Bounds);
Assert.Equal (new Rectangle (0, 0, 10, 1), view.Viewport);
Assert.Equal (new Rectangle (0, 0, 30, 2), view._needsDisplayRect);
top.Draw ();
@@ -555,7 +555,7 @@ At 0,0
);
view.Frame = new Rectangle (3, 3, 10, 1);
Assert.Equal (new Rectangle (0, 0, 10, 1), view.Bounds);
Assert.Equal (new Rectangle (0, 0, 10, 1), view.Viewport);
Assert.Equal (new Rectangle (0, 0, 10, 1), view._needsDisplayRect);
view.Draw ();
@@ -604,7 +604,7 @@ At 0,0
view.Width = 10;
view.Height = 1;
Assert.Equal (new Rectangle (3, 3, 10, 1), view.Frame);
Assert.Equal (new Rectangle (0, 0, 10, 1), view.Bounds);
Assert.Equal (new Rectangle (0, 0, 10, 1), view.Viewport);
Assert.Equal (new Rectangle (0, 0, 30, 2), view._needsDisplayRect);
view.Draw ();
@@ -651,7 +651,7 @@ At 0,0
view.Frame = new Rectangle (1, 1, 10, 1);
Assert.Equal (new Rectangle (1, 1, 10, 1), view.Frame);
Assert.Equal (LayoutStyle.Absolute, view.LayoutStyle);
Assert.Equal (new Rectangle (0, 0, 10, 1), view.Bounds);
Assert.Equal (new Rectangle (0, 0, 10, 1), view.Viewport);
Assert.Equal (new Rectangle (0, 0, 10, 1), view._needsDisplayRect);
view.Draw ();
@@ -700,7 +700,7 @@ At 0,0
view.Width = 10;
view.Height = 1;
Assert.Equal (new Rectangle (1, 1, 10, 1), view.Frame);
Assert.Equal (new Rectangle (0, 0, 10, 1), view.Bounds);
Assert.Equal (new Rectangle (0, 0, 10, 1), view.Viewport);
Assert.Equal (new Rectangle (0, 0, 30, 2), view._needsDisplayRect);
view.Draw ();
@@ -748,10 +748,10 @@ At 0,0
Assert.True (r.Visible);
Assert.Equal (LayoutStyle.Absolute, r.LayoutStyle);
Assert.Equal ($"View(){r.Bounds}", r.ToString ());
Assert.Equal ($"View(){r.Viewport}", r.ToString ());
Assert.False (r.CanFocus);
Assert.False (r.HasFocus);
Assert.Equal (new Rectangle (0, 0, 0, 0), r.Bounds);
Assert.Equal (new Rectangle (0, 0, 0, 0), r.Viewport);
Assert.Equal (new Rectangle (0, 0, 0, 0), r.Frame);
Assert.Null (r.Focused);
Assert.Null (r.ColorScheme);
@@ -773,10 +773,10 @@ At 0,0
r = new View { Frame = Rectangle.Empty };
Assert.NotNull (r);
Assert.Equal (LayoutStyle.Absolute, r.LayoutStyle);
Assert.Equal ($"View(){r.Bounds}", r.ToString ());
Assert.Equal ($"View(){r.Viewport}", r.ToString ());
Assert.False (r.CanFocus);
Assert.False (r.HasFocus);
Assert.Equal (new Rectangle (0, 0, 0, 0), r.Bounds);
Assert.Equal (new Rectangle (0, 0, 0, 0), r.Viewport);
Assert.Equal (new Rectangle (0, 0, 0, 0), r.Frame);
Assert.Null (r.Focused);
Assert.Null (r.ColorScheme);
@@ -801,7 +801,7 @@ At 0,0
Assert.Equal ($"View(){r.Frame}", r.ToString ());
Assert.False (r.CanFocus);
Assert.False (r.HasFocus);
Assert.Equal (new Rectangle (0, 0, 3, 4), r.Bounds);
Assert.Equal (new Rectangle (0, 0, 3, 4), r.Viewport);
Assert.Equal (new Rectangle (1, 2, 3, 4), r.Frame);
Assert.Null (r.Focused);
Assert.Null (r.ColorScheme);
@@ -832,7 +832,7 @@ At 0,0
r.EndInit ();
Assert.False (r.CanFocus);
Assert.False (r.HasFocus);
Assert.Equal (new Rectangle (0, 0, 1, 13), r.Bounds);
Assert.Equal (new Rectangle (0, 0, 1, 13), r.Viewport);
Assert.Equal (new Rectangle (0, 0, 1, 13), r.Frame);
Assert.Null (r.Focused);
Assert.Null (r.ColorScheme);
@@ -929,8 +929,8 @@ At 0,0
Assert.Equal (4, view.Height);
Assert.False (view.Frame.IsEmpty);
Assert.Equal (new Rectangle (1, 2, 3, 4), view.Frame);
Assert.False (view.Bounds.IsEmpty);
Assert.Equal (new Rectangle (0, 0, 3, 4), view.Bounds);
Assert.False (view.Viewport.IsEmpty);
Assert.Equal (new Rectangle (0, 0, 3, 4), view.Viewport);
view.LayoutSubviews ();
@@ -939,7 +939,7 @@ At 0,0
Assert.Equal (3, view.Width);
Assert.Equal (4, view.Height);
Assert.False (view.Frame.IsEmpty);
Assert.False (view.Bounds.IsEmpty);
Assert.False (view.Viewport.IsEmpty);
super.Dispose ();
#if DEBUG_IDISPOSABLE
@@ -953,7 +953,7 @@ At 0,0
Assert.Equal (0, view.Width);
Assert.Equal (0, view.Height);
Assert.True (view.Frame.IsEmpty);
Assert.True (view.Bounds.IsEmpty);
Assert.True (view.Viewport.IsEmpty);
view.Dispose ();
// Object Initializer
@@ -963,7 +963,7 @@ At 0,0
Assert.Equal (0, view.Width);
Assert.Equal (0, view.Height);
Assert.False (view.Frame.IsEmpty);
Assert.True (view.Bounds.IsEmpty);
Assert.True (view.Viewport.IsEmpty);
view.Dispose ();
// Default Constructor and post assignment equivalent to Object Initializer
@@ -983,8 +983,8 @@ At 0,0
Assert.Equal (4, view.Height);
Assert.False (view.Frame.IsEmpty);
Assert.Equal (new Rectangle (1, 2, 3, 4), view.Frame);
Assert.False (view.Bounds.IsEmpty);
Assert.Equal (new Rectangle (0, 0, 3, 4), view.Bounds);
Assert.False (view.Viewport.IsEmpty);
Assert.Equal (new Rectangle (0, 0, 3, 4), view.Viewport);
super.Dispose ();
}