Reamed Bounds -> ViewPort to see how it feels

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

View File

@@ -125,7 +125,7 @@ public class TableViewTests
// create a 4 by 4 table
var tableView = new TableView
{
Table = BuildTable (4, 4, out DataTable dt), MultiSelect = true, Bounds = new Rectangle (0, 0, 10, 5)
Table = BuildTable (4, 4, out DataTable dt), MultiSelect = true, Viewport = new Rectangle (0, 0, 10, 5)
};
tableView.BeginInit ();
tableView.EndInit ();
@@ -152,7 +152,7 @@ public class TableViewTests
// create a 4 by 4 table
var tableView = new TableView
{
Table = BuildTable (4, 4, out DataTable dt), MultiSelect = true, Bounds = new Rectangle (0, 0, 10, 5)
Table = BuildTable (4, 4, out DataTable dt), MultiSelect = true, Viewport = new Rectangle (0, 0, 10, 5)
};
tableView.BeginInit ();
tableView.EndInit ();
@@ -180,7 +180,7 @@ public class TableViewTests
var tableView = new TableView ();
tableView.BeginInit ();
tableView.EndInit ();
tableView.Bounds = new Rectangle (0, 0, 25, 10);
tableView.Viewport = new Rectangle (0, 0, 25, 10);
Assert.Equal (0, tableView.RowOffset);
Assert.Equal (0, tableView.ColumnOffset);
@@ -237,7 +237,7 @@ public class TableViewTests
{
var tableView = new TableView
{
Table = BuildTable (3, 3), MultiSelect = multiSelect, Bounds = new Rectangle (0, 0, 10, 5)
Table = BuildTable (3, 3), MultiSelect = multiSelect, Viewport = new Rectangle (0, 0, 10, 5)
};
tableView.BeginInit ();
tableView.EndInit ();
@@ -253,7 +253,7 @@ public class TableViewTests
{
var tableView = new TableView
{
Table = BuildTable (3, 3), MultiSelect = true, FullRowSelect = true, Bounds = new Rectangle (0, 0, 10, 5)
Table = BuildTable (3, 3), MultiSelect = true, FullRowSelect = true, Viewport = new Rectangle (0, 0, 10, 5)
};
tableView.BeginInit ();
tableView.EndInit ();
@@ -280,7 +280,7 @@ public class TableViewTests
{
var tableView = new TableView
{
Table = BuildTable (3, 3), MultiSelect = true, Bounds = new Rectangle (0, 0, 10, 5)
Table = BuildTable (3, 3), MultiSelect = true, Viewport = new Rectangle (0, 0, 10, 5)
};
tableView.BeginInit ();
tableView.EndInit ();
@@ -305,7 +305,7 @@ public class TableViewTests
{
var tableView = new TableView
{
Table = BuildTable (20, 20), MultiSelect = true, Bounds = new Rectangle (0, 0, 10, 5)
Table = BuildTable (20, 20), MultiSelect = true, Viewport = new Rectangle (0, 0, 10, 5)
};
tableView.BeginInit ();
tableView.EndInit ();
@@ -423,7 +423,7 @@ public class TableViewTests
tableView.ColorScheme = Colors.ColorSchemes ["TopLevel"];
// 25 characters can be printed into table
tableView.Bounds = new Rectangle (0, 0, 25, 5);
tableView.Viewport = new Rectangle (0, 0, 25, 5);
tableView.Style.ShowHorizontalHeaderUnderline = true;
tableView.Style.ShowHorizontalHeaderOverline = false;
tableView.Style.AlwaysShowHeaders = true;
@@ -524,7 +524,7 @@ public class TableViewTests
var driver = (FakeDriver)Application.Driver;
driver.ClearContents ();
tableView.Bounds = new Rectangle (0, 0, 9, 5);
tableView.Viewport = new Rectangle (0, 0, 9, 5);
tableView.LayoutSubviews ();
tableView.Draw ();
@@ -541,7 +541,7 @@ public class TableViewTests
// setting width to 10 leaves just enough space for the column to
// meet MinAcceptableWidth of 5. Column width includes terminator line
// symbol (e.g. ┤ or │)
tableView.Bounds = new Rectangle (0, 0, 10, 5);
tableView.Viewport = new Rectangle (0, 0, 10, 5);
tableView.LayoutSubviews ();
tableView.Draw ();
@@ -554,7 +554,7 @@ public class TableViewTests
";
TestHelpers.AssertDriverContentsAre (expected, output);
tableView.Bounds = new Rectangle (0, 0, 25, 5);
tableView.Viewport = new Rectangle (0, 0, 25, 5);
// revert style change
style.MinAcceptableWidth = TableView.DefaultMinAcceptableWidth;
@@ -601,7 +601,7 @@ public class TableViewTests
{
var tableView = new TableView
{
Table = BuildTable (25, 50), MultiSelect = true, Bounds = new Rectangle (0, 0, 10, 5)
Table = BuildTable (25, 50), MultiSelect = true, Viewport = new Rectangle (0, 0, 10, 5)
};
// Header should take up 2 lines
@@ -637,7 +637,7 @@ public class TableViewTests
{
var tableView = new TableView ();
tableView.ColorScheme = new ColorScheme ();
tableView.Bounds = new Rectangle (0, 0, 25, 10);
tableView.Viewport = new Rectangle (0, 0, 25, 10);
// Set a table with 1 column
tableView.Table = BuildTable (1, 50, out DataTable dt);
@@ -659,7 +659,7 @@ public class TableViewTests
tableView.Table = BuildTable (25, 50);
// 1 header + 4 rows visible
tableView.Bounds = new Rectangle (0, 0, 25, 5);
tableView.Viewport = new Rectangle (0, 0, 25, 5);
tableView.Style.ShowHorizontalHeaderUnderline = false;
tableView.Style.ShowHorizontalHeaderOverline = false;
tableView.Style.AlwaysShowHeaders = true;
@@ -686,7 +686,7 @@ public class TableViewTests
tableView.ColorScheme = Colors.ColorSchemes ["TopLevel"];
// 3 columns are visibile
tableView.Bounds = new Rectangle (0, 0, 7, 5);
tableView.Viewport = new Rectangle (0, 0, 7, 5);
tableView.Style.ShowHorizontalHeaderUnderline = true;
tableView.Style.ShowHorizontalHeaderOverline = false;
tableView.Style.AlwaysShowHeaders = true;
@@ -764,7 +764,7 @@ public class TableViewTests
tableView.LayoutSubviews ();
// 3 columns are visibile
tableView.Bounds = new Rectangle (0, 0, 7, 5);
tableView.Viewport = new Rectangle (0, 0, 7, 5);
tableView.Style.ShowHorizontalHeaderUnderline = false;
tableView.Style.ShowHorizontalHeaderOverline = false;
tableView.Style.AlwaysShowHeaders = true;
@@ -827,7 +827,7 @@ public class TableViewTests
tableView.ColorScheme = Colors.ColorSchemes ["TopLevel"];
// 3 columns are visibile
tableView.Bounds = new Rectangle (0, 0, 7, 5);
tableView.Viewport = new Rectangle (0, 0, 7, 5);
tableView.Style.ShowHorizontalHeaderUnderline = false;
tableView.Style.ShowHorizontalHeaderOverline = false;
tableView.Style.AlwaysShowHeaders = true;
@@ -944,7 +944,7 @@ public class TableViewTests
tableView.ColorScheme = Colors.ColorSchemes ["TopLevel"];
// 3 columns are visibile
tableView.Bounds = new Rectangle (0, 0, 7, 5);
tableView.Viewport = new Rectangle (0, 0, 7, 5);
tableView.Style.ShowHorizontalHeaderUnderline = true;
tableView.Style.ShowHorizontalHeaderOverline = false;
tableView.Style.AlwaysShowHeaders = true;
@@ -975,7 +975,7 @@ public class TableViewTests
tableView.ColorScheme = Colors.ColorSchemes ["TopLevel"];
// 3 columns are visibile
tableView.Bounds = new Rectangle (0, 0, 7, 5);
tableView.Viewport = new Rectangle (0, 0, 7, 5);
tableView.Style.ShowHorizontalHeaderUnderline = true;
tableView.Style.ShowHorizontalHeaderOverline = false;
tableView.Style.AlwaysShowHeaders = true;
@@ -1044,7 +1044,7 @@ public class TableViewTests
tv.LayoutSubviews ();
// width exactly matches the max col widths
tv.Bounds = new Rectangle (0, 0, 5, 4);
tv.Viewport = new Rectangle (0, 0, 5, 4);
// Create a style for column B
ColumnStyle bStyle = tv.Style.GetOrCreateColumnStyle (1);
@@ -1141,7 +1141,7 @@ public class TableViewTests
tv.LayoutSubviews ();
// width exactly matches the max col widths
tv.Bounds = new Rectangle (0, 0, 5, 4);
tv.Viewport = new Rectangle (0, 0, 5, 4);
var rowHighlight = new ColorScheme
{
@@ -1235,7 +1235,7 @@ public class TableViewTests
tv.LayoutSubviews ();
// width exactly matches the max col widths
tv.Bounds = new Rectangle (0, 0, 5, 4);
tv.Viewport = new Rectangle (0, 0, 5, 4);
// private method for forcing the view to be focused/not focused
MethodInfo setFocusMethod =
@@ -1282,7 +1282,7 @@ public class TableViewTests
tv.LayoutSubviews ();
// width exactly matches the max col widths
tv.Bounds = new Rectangle (0, 0, 5, 4);
tv.Viewport = new Rectangle (0, 0, 5, 4);
// private method for forcing the view to be focused/not focused
MethodInfo setFocusMethod =
@@ -1354,7 +1354,7 @@ public class TableViewTests
tv.Style.ExpandLastColumn = false;
// width exactly matches the max col widths
tv.Bounds = new Rectangle (0, 0, 5, 4);
tv.Viewport = new Rectangle (0, 0, 5, 4);
tv.Draw ();
@@ -1398,7 +1398,7 @@ public class TableViewTests
public void TableView_ShowHeadersFalse_AllLines ()
{
TableView tv = GetABCDEFTableView (out _);
tv.Bounds = new Rectangle (0, 0, 5, 5);
tv.Viewport = new Rectangle (0, 0, 5, 5);
tv.Style.ShowHeaders = false;
tv.Style.ShowHorizontalHeaderOverline = true;
@@ -1422,7 +1422,7 @@ public class TableViewTests
public void TableView_ShowHeadersFalse_AndNoHeaderLines ()
{
TableView tv = GetABCDEFTableView (out _);
tv.Bounds = new Rectangle (0, 0, 5, 5);
tv.Viewport = new Rectangle (0, 0, 5, 5);
tv.Style.ShowHeaders = false;
tv.Style.ShowHorizontalHeaderOverline = false;
@@ -1441,7 +1441,7 @@ public class TableViewTests
public void TableView_ShowHeadersFalse_OverlineTrue ()
{
TableView tv = GetABCDEFTableView (out _);
tv.Bounds = new Rectangle (0, 0, 5, 5);
tv.Viewport = new Rectangle (0, 0, 5, 5);
tv.Style.ShowHeaders = false;
tv.Style.ShowHorizontalHeaderOverline = true;
@@ -1461,7 +1461,7 @@ public class TableViewTests
public void TableView_ShowHeadersFalse_UnderlineTrue ()
{
TableView tv = GetABCDEFTableView (out _);
tv.Bounds = new Rectangle (0, 0, 5, 5);
tv.Viewport = new Rectangle (0, 0, 5, 5);
tv.Style.ShowHeaders = false;
tv.Style.ShowHorizontalHeaderOverline = false;
@@ -1588,7 +1588,7 @@ public class TableViewTests
{
var tv = new TableView ();
tv.ColorScheme = Colors.ColorSchemes ["TopLevel"];
tv.Bounds = new Rectangle (0, 0, 50, 7);
tv.Viewport = new Rectangle (0, 0, 50, 7);
tv.Table = new EnumerableTableSource<string> (
new [] { "fish", "troll", "trap", "zoo" },
@@ -2219,7 +2219,7 @@ public class TableViewTests
{
var tv = new TableView ();
tv.ColorScheme = Colors.ColorSchemes ["TopLevel"];
tv.Bounds = new Rectangle (0, 0, 50, 6);
tv.Viewport = new Rectangle (0, 0, 50, 6);
tv.Table = new EnumerableTableSource<Type> (
new [] { typeof (string), typeof (int), typeof (float) },
@@ -2253,7 +2253,7 @@ public class TableViewTests
TableView tv = GetTwoRowSixColumnTable (out DataTable dt);
dt.Rows.Add (1, 2, 3, 4, 5, 6);
tv.Bounds = new Rectangle (0, 0, 7, 6);
tv.Viewport = new Rectangle (0, 0, 7, 6);
tv.Frame = new Rectangle (0, 0, 7, 6);
tv.LayoutSubviews ();
@@ -2269,7 +2269,7 @@ public class TableViewTests
// should select that row
Assert.Equal (2, tv.SelectedRow);
tv.OnDrawContent (tv.Bounds);
tv.OnDrawContent (tv.Viewport);
var expected =
@"
@@ -2310,7 +2310,7 @@ public class TableViewTests
dt.Rows.Add (1, 2, 3, 4, 5, 6);
tv.LayoutSubviews ();
tv.Bounds = new Rectangle (0, 0, 7, 6);
tv.Viewport = new Rectangle (0, 0, 7, 6);
tv.FullRowSelect = true;
tv.Style.ShowVerticalCellLines = false;
@@ -2362,7 +2362,7 @@ A B C
TableView tv = GetTwoRowSixColumnTable (out DataTable dt);
dt.Rows.Add (1, 2, 3, 4, 5, 6);
tv.Bounds = new Rectangle (0, 0, 7, 6);
tv.Viewport = new Rectangle (0, 0, 7, 6);
tv.Frame = new Rectangle (0, 0, 7, 6);
tv.LayoutSubviews ();
@@ -2377,7 +2377,7 @@ A B C
// should select that row
Assert.Equal (2, tv.SelectedRow);
tv.OnDrawContent (tv.Bounds);
tv.OnDrawContent (tv.Viewport);
var expected =
@"
@@ -2425,7 +2425,7 @@ A B C
//tv.BeginInit (); tv.EndInit ();
tv.ColorScheme = Colors.ColorSchemes ["TopLevel"];
tv.Bounds = new Rectangle (0, 0, 25, 4);
tv.Viewport = new Rectangle (0, 0, 25, 4);
tv.Style = new TableStyle
{
@@ -3194,7 +3194,7 @@ A B C
tableView.ColorScheme = Colors.ColorSchemes ["TopLevel"];
// 3 columns are visible
tableView.Bounds = new Rectangle (0, 0, 7, 5);
tableView.Viewport = new Rectangle (0, 0, 7, 5);
tableView.Style.ShowHorizontalHeaderUnderline = false;
tableView.Style.ShowHorizontalHeaderOverline = false;
tableView.Style.AlwaysShowHeaders = true;
@@ -3218,7 +3218,7 @@ A B C
{
var tv = new TableView ();
tv.ColorScheme = Colors.ColorSchemes ["TopLevel"];
tv.Bounds = new Rectangle (0, 0, 25, 6);
tv.Viewport = new Rectangle (0, 0, 25, 6);
List<PickablePet> pets = new ()
{
@@ -3248,7 +3248,7 @@ A B C
tableView.ColorScheme = Colors.ColorSchemes ["TopLevel"];
// 3 columns are visible
tableView.Bounds = new Rectangle (0, 0, 7, 5);
tableView.Viewport = new Rectangle (0, 0, 7, 5);
tableView.Style.ShowHorizontalHeaderUnderline = true;
tableView.Style.ShowHorizontalHeaderOverline = false;
tableView.Style.AlwaysShowHeaders = true;
@@ -3277,7 +3277,7 @@ A B C
var tv = new TableView ();
tv.BeginInit ();
tv.EndInit ();
tv.Bounds = new Rectangle (0, 0, 10, 4);
tv.Viewport = new Rectangle (0, 0, 10, 4);
dt = new DataTable ();
dt.Columns.Add ("A");