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

Reverting Clear method to use AddRune as initially.

Browse Source
This commit is contained in:
BDisp
2022-05-18 16:50:39 +01:00
parent 1071d70455
commit 7f3c26906b
3 changed files with 98 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Terminal.Gui/Core/View.cs
View File

@@ -1022,7 +1022,7 @@ namespace Terminal.Gui {
for (int line = 0; line < h; line++) {
Move (0, line);
for (int col = 0; col < w; col++)
Driver.AddStr (" ");
Driver.AddRune (' ');
}
}

2
UnitTests/GraphViewTests.cs
View File

@@ -207,7 +207,7 @@ namespace Terminal.Gui.Views {
Assert.Equal (expectedLook, actualLook);
}
return new Rect (x, y, w > -1 ? w : 0, h > -1 ? h : 0);
return new Rect (x > -1 ? x : 0, y > -1 ? y : 0, w > -1 ? w : 0, h > -1 ? h : 0);
}
#pragma warning disable xUnit1013 // Public method should be marked as test

96
UnitTests/ViewTests.cs
View File

@@ -2256,5 +2256,101 @@ Y
pos = GraphViewTests.AssertDriverContentsWithFrameAre (expected, output);
Assert.Equal (new Rect (1, 1, 21, 14), pos);
}
[Fact, AutoInitShutdown]
public void Clear_Can_Use_Driver_AddRune_Or_AddStr_Methods ()
{
var view = new View () {
Width = Dim.Fill (),
Height = Dim.Fill ()
};
view.LayoutComplete += e => {
view.DrawFrame (view.Bounds);
var savedClip = Application.Driver.Clip;
Application.Driver.Clip = new Rect (1, 1, view.Bounds.Width - 2, view.Bounds.Height - 2);
for (int row = 0; row < view.Bounds.Height - 2; row++) {
Application.Driver.Move (1, row + 1);
for (int col = 0; col < view.Bounds.Width - 2; col++) {
Application.Driver.AddStr ($"{col}");
}
}
Application.Driver.Clip = savedClip;
};
Application.Top.Add (view);
Application.Begin (Application.Top);
((FakeDriver)Application.Driver).SetBufferSize (20, 10);
var expected = @"
┌──────────────────┐
│012345678910111213│
│012345678910111213│
│012345678910111213│
│012345678910111213│
│012345678910111213│
│012345678910111213│
│012345678910111213│
│012345678910111213│
└──────────────────┘
";
var pos = GraphViewTests.AssertDriverContentsWithFrameAre (expected, output);
Assert.Equal (new Rect (0, 0, 20, 10), pos);
view.Clear ();
expected = @"
";
pos = GraphViewTests.AssertDriverContentsWithFrameAre (expected, output);
Assert.Equal (Rect.Empty, pos);
}
[Fact, AutoInitShutdown]
public void Clear_Bounds_Can_Use_Driver_AddRune_Or_AddStr_Methods ()
{
var view = new View () {
Width = Dim.Fill (),
Height = Dim.Fill ()
};
view.LayoutComplete += e => {
view.DrawFrame (view.Bounds);
var savedClip = Application.Driver.Clip;
Application.Driver.Clip = new Rect (1, 1, view.Bounds.Width - 2, view.Bounds.Height - 2);
for (int row = 0; row < view.Bounds.Height - 2; row++) {
Application.Driver.Move (1, row + 1);
for (int col = 0; col < view.Bounds.Width - 2; col++) {
Application.Driver.AddStr ($"{col}");
}
}
Application.Driver.Clip = savedClip;
};
Application.Top.Add (view);
Application.Begin (Application.Top);
((FakeDriver)Application.Driver).SetBufferSize (20, 10);
var expected = @"
┌──────────────────┐
│012345678910111213│
│012345678910111213│
│012345678910111213│
│012345678910111213│
│012345678910111213│
│012345678910111213│
│012345678910111213│
│012345678910111213│
└──────────────────┘
";
var pos = GraphViewTests.AssertDriverContentsWithFrameAre (expected, output);
Assert.Equal (new Rect (0, 0, 20, 10), pos);
view.Clear (view.Bounds);
expected = @"
";
pos = GraphViewTests.AssertDriverContentsWithFrameAre (expected, output);
Assert.Equal (Rect.Empty, pos);
}
}
}