Fix bad merge changes

This commit is contained in:
tznind
2023-03-03 01:37:30 +00:00
parent d182c66ea2
commit 8d62f3966f
28 changed files with 2448 additions and 1578 deletions

View File

@@ -171,7 +171,7 @@ namespace Terminal.Gui.DriverTests {
// MockDriver will still be 120x40
wasTerminalResized = false;
Application.EnableConsoleScrolling = true;
Application.HeightAsBuffer = true;
driver.SetWindowSize (40, 20);
Assert.Equal (120, Application.Driver.Cols);
Assert.Equal (40, Application.Driver.Rows);
@@ -186,12 +186,12 @@ namespace Terminal.Gui.DriverTests {
[Theory]
[InlineData (typeof (FakeDriver))]
public void EnableConsoleScrolling_Is_False_Left_And_Top_Is_Always_Zero (Type driverType)
public void HeightAsBuffer_Is_False_Left_And_Top_Is_Always_Zero (Type driverType)
{
var driver = (FakeDriver)Activator.CreateInstance (driverType);
Application.Init (driver);
Assert.False (Application.EnableConsoleScrolling);
Assert.False (Application.HeightAsBuffer);
Assert.Equal (0, Console.WindowLeft);
Assert.Equal (0, Console.WindowTop);
@@ -204,13 +204,13 @@ namespace Terminal.Gui.DriverTests {
[Theory]
[InlineData (typeof (FakeDriver))]
public void EnableConsoleScrolling_Is_True_Left_Cannot_Be_Greater_Than_WindowWidth (Type driverType)
public void HeightAsBuffer_Is_True_Left_Cannot_Be_Greater_Than_WindowWidth (Type driverType)
{
var driver = (FakeDriver)Activator.CreateInstance (driverType);
Application.Init (driver);
Application.EnableConsoleScrolling = true;
Assert.True (Application.EnableConsoleScrolling);
Application.HeightAsBuffer = true;
Assert.True (Application.HeightAsBuffer);
driver.SetWindowPosition (81, 25);
Assert.Equal (0, Console.WindowLeft);
@@ -221,13 +221,13 @@ namespace Terminal.Gui.DriverTests {
[Theory]
[InlineData (typeof (FakeDriver))]
public void EnableConsoleScrolling_Is_True_Left_Cannot_Be_Greater_Than_BufferWidth_Minus_WindowWidth (Type driverType)
public void HeightAsBuffer_Is_True_Left_Cannot_Be_Greater_Than_BufferWidth_Minus_WindowWidth (Type driverType)
{
var driver = (FakeDriver)Activator.CreateInstance (driverType);
Application.Init (driver);
Application.EnableConsoleScrolling = true;
Assert.True (Application.EnableConsoleScrolling);
Application.HeightAsBuffer = true;
Assert.True (Application.HeightAsBuffer);
driver.SetWindowPosition (81, 25);
Assert.Equal (0, Console.WindowLeft);
@@ -261,13 +261,13 @@ namespace Terminal.Gui.DriverTests {
[Theory]
[InlineData (typeof (FakeDriver))]
public void EnableConsoleScrolling_Is_True_Top_Cannot_Be_Greater_Than_WindowHeight (Type driverType)
public void HeightAsBuffer_Is_True_Top_Cannot_Be_Greater_Than_WindowHeight (Type driverType)
{
var driver = (FakeDriver)Activator.CreateInstance (driverType);
Application.Init (driver);
Application.EnableConsoleScrolling = true;
Assert.True (Application.EnableConsoleScrolling);
Application.HeightAsBuffer = true;
Assert.True (Application.HeightAsBuffer);
driver.SetWindowPosition (80, 26);
Assert.Equal (0, Console.WindowLeft);
@@ -278,13 +278,13 @@ namespace Terminal.Gui.DriverTests {
[Theory]
[InlineData (typeof (FakeDriver))]
public void EnableConsoleScrolling_Is_True_Top_Cannot_Be_Greater_Than_BufferHeight_Minus_WindowHeight (Type driverType)
public void HeightAsBuffer_Is_True_Top_Cannot_Be_Greater_Than_BufferHeight_Minus_WindowHeight (Type driverType)
{
var driver = (FakeDriver)Activator.CreateInstance (driverType);
Application.Init (driver);
Application.EnableConsoleScrolling = true;
Assert.True (Application.EnableConsoleScrolling);
Application.HeightAsBuffer = true;
Assert.True (Application.HeightAsBuffer);
driver.SetWindowPosition (80, 26);
Assert.Equal (0, Console.WindowLeft);