mirror of
https://github.com/gui-cs/Terminal.Gui.git
synced 2026-01-01 16:59:35 +01:00
Refactored Application into smaller files.
Made Application #nullable enable
This commit is contained in:
@@ -14,26 +14,26 @@ public class ViewTests (ITestOutputHelper output)
|
||||
|
||||
view.DrawContent += (s, e) =>
|
||||
{
|
||||
Rectangle savedClip = Application.Driver.Clip;
|
||||
Application.Driver.Clip = new (1, 1, view.Viewport.Width, view.Viewport.Height);
|
||||
Rectangle savedClip = Application.Driver!.Clip;
|
||||
Application.Driver!.Clip = new (1, 1, view.Viewport.Width, view.Viewport.Height);
|
||||
|
||||
for (var row = 0; row < view.Viewport.Height; row++)
|
||||
{
|
||||
Application.Driver.Move (1, row + 1);
|
||||
Application.Driver?.Move (1, row + 1);
|
||||
|
||||
for (var col = 0; col < view.Viewport.Width; col++)
|
||||
{
|
||||
Application.Driver.AddStr ($"{col}");
|
||||
Application.Driver?.AddStr ($"{col}");
|
||||
}
|
||||
}
|
||||
|
||||
Application.Driver.Clip = savedClip;
|
||||
Application.Driver!.Clip = savedClip;
|
||||
e.Cancel = true;
|
||||
};
|
||||
var top = new Toplevel ();
|
||||
top.Add (view);
|
||||
Application.Begin (top);
|
||||
((FakeDriver)Application.Driver).SetBufferSize (20, 10);
|
||||
((FakeDriver)Application.Driver!).SetBufferSize (20, 10);
|
||||
|
||||
var expected = @"
|
||||
┌──────────────────┐
|
||||
@@ -78,26 +78,26 @@ public class ViewTests (ITestOutputHelper output)
|
||||
|
||||
view.DrawContent += (s, e) =>
|
||||
{
|
||||
Rectangle savedClip = Application.Driver.Clip;
|
||||
Application.Driver.Clip = new (1, 1, view.Viewport.Width, view.Viewport.Height);
|
||||
Rectangle savedClip = Application.Driver!.Clip;
|
||||
Application.Driver!.Clip = new (1, 1, view.Viewport.Width, view.Viewport.Height);
|
||||
|
||||
for (var row = 0; row < view.Viewport.Height; row++)
|
||||
{
|
||||
Application.Driver.Move (1, row + 1);
|
||||
Application.Driver?.Move (1, row + 1);
|
||||
|
||||
for (var col = 0; col < view.Viewport.Width; col++)
|
||||
{
|
||||
Application.Driver.AddStr ($"{col}");
|
||||
Application.Driver?.AddStr ($"{col}");
|
||||
}
|
||||
}
|
||||
|
||||
Application.Driver.Clip = savedClip;
|
||||
Application.Driver!.Clip = savedClip;
|
||||
e.Cancel = true;
|
||||
};
|
||||
var top = new Toplevel ();
|
||||
top.Add (view);
|
||||
Application.Begin (top);
|
||||
((FakeDriver)Application.Driver).SetBufferSize (20, 10);
|
||||
((FakeDriver)Application.Driver!).SetBufferSize (20, 10);
|
||||
|
||||
var expected = @"
|
||||
┌──────────────────┐
|
||||
@@ -1016,7 +1016,7 @@ At 0,0
|
||||
view.Height = Dim.Auto ();
|
||||
Assert.Equal ("Testing visibility.".Length, view.Frame.Width);
|
||||
Assert.True (view.Visible);
|
||||
((FakeDriver)Application.Driver).SetBufferSize (30, 5);
|
||||
((FakeDriver)Application.Driver!).SetBufferSize (30, 5);
|
||||
|
||||
TestHelpers.AssertDriverContentsWithFrameAre (
|
||||
@"
|
||||
@@ -1107,9 +1107,9 @@ At 0,0
|
||||
Cell [,] contents = ((FakeDriver)Application.Driver).Contents;
|
||||
var runesCount = 0;
|
||||
|
||||
for (var i = 0; i < Application.Driver.Rows; i++)
|
||||
for (var i = 0; i < Application.Driver!.Rows; i++)
|
||||
{
|
||||
for (var j = 0; j < Application.Driver.Cols; j++)
|
||||
for (var j = 0; j < Application.Driver!.Cols; j++)
|
||||
{
|
||||
if (contents [i, j].Rune != (Rune)' ')
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user