Fixes #2482. Refactor Redraw - Non-virtual with the right set of virtual OnXXX methods. (#2577)

* Fixes #2482. Refactor Redraw - Non-virtual with the right set of virtual OnXXX methods.

* Change documentation comments.

* Fixes #2575 - TableView to use interface instead of System.Data.DataTable (#2576)

* WIP: Add ITableDataSource

* WIP: Refactor TableView

* WIP: Port CSVEditor

* WIP: Port TableEditor

* WIP: Port MultiColouredTable scenario

* Fix bug of adding duplicate column styles

* Update tests to use DataTableSource

* Tidy up

* Add EnumerableTableDataSource<T>

* Add test for EnumerableTableDataSource

* Add test for EnumerableTableDataSource

* Add code example to xmldoc

* Add ProcessTable scenario

* Rename ITableDataSource to ITableSource and update docs

* Rename EnumerableTableDataSource to EnumerableTableSource

* Fixed Frame != Bounds; changed UICat Scenarios list to use tableview!

* Fix scroll resetting in ProcessTable scenario

* Fix unit tests by setting Frame to same as Bounds

* Document why we have to measure our data for use with TableView

---------

Co-authored-by: Tig Kindel <tig@users.noreply.github.com>

* Fixes #2582 - Refactors FileDialog for cleaner data model (#2583)

* WIP: Add ITableDataSource

* WIP: Refactor TableView

* WIP: Port CSVEditor

* WIP: Port TableEditor

* WIP: Port MultiColouredTable scenario

* Fix bug of adding duplicate column styles

* Update tests to use DataTableSource

* Tidy up

* Add EnumerableTableDataSource<T>

* Add test for EnumerableTableDataSource

* Add test for EnumerableTableDataSource

* Add code example to xmldoc

* Add ProcessTable scenario

* Rename ITableDataSource to ITableSource and update docs

* Rename EnumerableTableDataSource to EnumerableTableSource

* Fixed Frame != Bounds; changed UICat Scenarios list to use tableview!

* Fix scroll resetting in ProcessTable scenario

* Fix unit tests by setting Frame to same as Bounds

* Document why we have to measure our data for use with TableView

* WIP: Simplify FileDialogs use of TableView

* WIP start migrating sorter

* WIP new filedialog table source mostly working

* WIP remove sorter class

* Refactor GetOrderByValue to be adjacent to GetColumnValue

* Fix collection navigator back so it ignores icon

* Fix unit tests

* Tidy up

* Fix UseColors

* Add test for UseColors

---------

Co-authored-by: Tig Kindel <tig@users.noreply.github.com>

* Fixes #2196. TextView: Setting Text places cursor at beginning, unlike TextField (#2572)

* Fixes #2196. TextView: Setting Text places cursor at beginning, unlike TextField

* Change all private members to have the _prefix.

* Renamed local member to prevLayoutStyle.

* Helper function for SetNeedsDisplay.

* Fixes #2569. Borders scenarios needed to be refactored. (#2570)

* Fixes #2569. Borders scenarios needed to be refactored.

* Fix border title with width equal to 4 and thickness top grater than 1.

* Improves border manipulation on borders scenarios.

* Prevents null value on the margin, border and padding thickness on the border scenarios.

* Remove NStack using dependence and fix prior commit.

* Refactoring the Frames scenario.

* Deleted borders scenarios.

* I did not realize that it was changed to SetSubViewNeedsDisplay.

* Re-layout; fixed colorpicker; fixed radio group

* Remove Thickness.IsEmpty as requested.

* Change the Frames scenario as requested.

---------

Co-authored-by: Tig Kindel <tig@users.noreply.github.com>

* Builds CollectionNavigator support into UI Catalog for TableView (#2584)

* Builds collectionnav support into UI cat for TableView

* Fixes keyboard mapping

* MultiSelect = false for TableView

* MultiSelect = false doesn't unbind ctrl-a

* Fixes #2581 Refactor CollectionNavigator so it supports TableView (#2586)

* Refactor CollectionNavigator to a base and a collection implementation

* Refactor CollectionNavigatorBase to look for first match smartly

* Add TableCollectionNavigator

* Make TableCollectionNavigator a core part of TableView

* Fix bad merge

* Added tests for tableview collection navigator

* Add FileDialogCollectionNavigator which ignores . and directory separator prefixes on file names

* whitespace fixes

---------

Co-authored-by: Tig <tig@users.noreply.github.com>

* Resolving merge conflicts.

* Fix merge errors.

* Fix merge errors.

* Add Command.Accept and snap to the selected glyph when ShowHorizontalScrollIndicator change to true.

* Reformat.

* Reformat again.

---------

Co-authored-by: Thomas Nind <31306100+tznind@users.noreply.github.com>
Co-authored-by: Tig Kindel <tig@users.noreply.github.com>
This commit is contained in:
BDisp
2023-05-04 12:17:59 +01:00
committed by GitHub
parent 01544dc60c
commit ea24de3a27
67 changed files with 921 additions and 846 deletions

View File

@@ -255,7 +255,7 @@ namespace Terminal.Gui.ViewsTests {
tab1.Text = "12";
tab2.Text = "13";
tv.Redraw (tv.Bounds);
tv.Draw ();
TestHelpers.AssertDriverContentsWithFrameAre (@"
┌──┐
@@ -266,7 +266,7 @@ namespace Terminal.Gui.ViewsTests {
tv.SelectedTab = tab2;
tv.Redraw (tv.Bounds);
tv.Draw ();
TestHelpers.AssertDriverContentsWithFrameAre (@"
┌──┐
@@ -280,7 +280,7 @@ namespace Terminal.Gui.ViewsTests {
tab1.Text = "12345678910";
tab2.Text = "13";
tv.Redraw (tv.Bounds);
tv.Draw ();
TestHelpers.AssertDriverContentsWithFrameAre (@"
┌───────┐
@@ -291,7 +291,7 @@ namespace Terminal.Gui.ViewsTests {
//switch to tab2
tv.SelectedTab = tab2;
tv.Redraw (tv.Bounds);
tv.Draw ();
TestHelpers.AssertDriverContentsWithFrameAre (@"
┌──┐
@@ -304,7 +304,7 @@ namespace Terminal.Gui.ViewsTests {
tab1.Text = "12345678910";
tab2.Text = "abcdefghijklmnopq";
tv.Redraw (tv.Bounds);
tv.Draw ();
TestHelpers.AssertDriverContentsWithFrameAre (@"
┌───────┐
@@ -330,7 +330,7 @@ namespace Terminal.Gui.ViewsTests {
tab1.Text = "12";
tab2.Text = "13";
tv.Redraw (tv.Bounds);
tv.Draw ();
TestHelpers.AssertDriverContentsWithFrameAre (@"
│12│13
@@ -341,7 +341,7 @@ namespace Terminal.Gui.ViewsTests {
tv.SelectedTab = tab2;
tv.Redraw (tv.Bounds);
tv.Draw ();
TestHelpers.AssertDriverContentsWithFrameAre (@"
12│13│
@@ -356,7 +356,7 @@ namespace Terminal.Gui.ViewsTests {
tab1.Text = "12345678910";
tab2.Text = "13";
tv.Redraw (tv.Bounds);
tv.Draw ();
TestHelpers.AssertDriverContentsWithFrameAre (@"
│1234567│
@@ -367,7 +367,7 @@ namespace Terminal.Gui.ViewsTests {
//switch to tab2
tv.SelectedTab = tab2;
tv.Redraw (tv.Bounds);
tv.Draw ();
TestHelpers.AssertDriverContentsWithFrameAre (@"
│13│
@@ -380,7 +380,7 @@ namespace Terminal.Gui.ViewsTests {
tab1.Text = "12345678910";
tab2.Text = "abcdefghijklmnopq";
tv.Redraw (tv.Bounds);
tv.Draw ();
TestHelpers.AssertDriverContentsWithFrameAre (@"
│abcdefg│
@@ -398,7 +398,7 @@ namespace Terminal.Gui.ViewsTests {
tv.Height = 5;
tv.LayoutSubviews ();
tv.Redraw (tv.Bounds);
tv.Draw ();
TestHelpers.AssertDriverContentsWithFrameAre (@"
┌─┐
@@ -418,7 +418,7 @@ namespace Terminal.Gui.ViewsTests {
tv.ApplyStyleChanges ();
tv.LayoutSubviews ();
tv.Redraw (tv.Bounds);
tv.Draw ();
TestHelpers.AssertDriverContentsWithFrameAre (@"
│T│
@@ -436,7 +436,7 @@ namespace Terminal.Gui.ViewsTests {
tv.Height = 5;
tv.LayoutSubviews ();
tv.Redraw (tv.Bounds);
tv.Draw ();
TestHelpers.AssertDriverContentsWithFrameAre (@"
┌┐
@@ -456,7 +456,7 @@ namespace Terminal.Gui.ViewsTests {
tv.ApplyStyleChanges ();
tv.LayoutSubviews ();
tv.Redraw (tv.Bounds);
tv.Draw ();
TestHelpers.AssertDriverContentsWithFrameAre (@"
││
@@ -482,7 +482,7 @@ namespace Terminal.Gui.ViewsTests {
tab1.Text = "12";
tab2.Text = "13";
tv.Redraw (tv.Bounds);
tv.Draw ();
TestHelpers.AssertDriverContentsWithFrameAre (@"
┌────────┐
@@ -495,7 +495,7 @@ namespace Terminal.Gui.ViewsTests {
tab1.Text = "12345678910";
tab2.Text = "13";
tv.Redraw (tv.Bounds);
tv.Draw ();
TestHelpers.AssertDriverContentsWithFrameAre (@"
┌────────┐
@@ -506,7 +506,7 @@ namespace Terminal.Gui.ViewsTests {
//switch to tab2
tv.SelectedTab = tab2;
tv.Redraw (tv.Bounds);
tv.Draw ();
TestHelpers.AssertDriverContentsWithFrameAre (@"
┌────────┐
@@ -519,7 +519,7 @@ namespace Terminal.Gui.ViewsTests {
tab1.Text = "12345678910";
tab2.Text = "abcdefghijklmnopq";
tv.Redraw (tv.Bounds);
tv.Draw ();
TestHelpers.AssertDriverContentsWithFrameAre (@"
┌────────┐
@@ -545,7 +545,7 @@ namespace Terminal.Gui.ViewsTests {
tab1.Text = "12";
tab2.Text = "13";
tv.Redraw (tv.Bounds);
tv.Draw ();
TestHelpers.AssertDriverContentsWithFrameAre (@"
┌────────┐
@@ -556,7 +556,7 @@ namespace Terminal.Gui.ViewsTests {
tv.SelectedTab = tab2;
tv.Redraw (tv.Bounds);
tv.Draw ();
TestHelpers.AssertDriverContentsWithFrameAre (@"
┌────────┐
@@ -571,7 +571,7 @@ namespace Terminal.Gui.ViewsTests {
tab1.Text = "12345678910";
tab2.Text = "13";
tv.Redraw (tv.Bounds);
tv.Draw ();
TestHelpers.AssertDriverContentsWithFrameAre (@"
┌────────┐
@@ -582,7 +582,7 @@ namespace Terminal.Gui.ViewsTests {
//switch to tab2
tv.SelectedTab = tab2;
tv.Redraw (tv.Bounds);
tv.Draw ();
TestHelpers.AssertDriverContentsWithFrameAre (@"
┌────────┐
@@ -595,7 +595,7 @@ namespace Terminal.Gui.ViewsTests {
tab1.Text = "12345678910";
tab2.Text = "abcdefghijklmnopq";
tv.Redraw (tv.Bounds);
tv.Draw ();
TestHelpers.AssertDriverContentsWithFrameAre (@"
┌────────┐
@@ -615,7 +615,7 @@ namespace Terminal.Gui.ViewsTests {
tv.ApplyStyleChanges ();
tv.LayoutSubviews ();
tv.Redraw (tv.Bounds);
tv.Draw ();
TestHelpers.AssertDriverContentsWithFrameAre (@"
┌──┐
@@ -635,7 +635,7 @@ namespace Terminal.Gui.ViewsTests {
tv.ApplyStyleChanges ();
tv.LayoutSubviews ();
tv.Redraw (tv.Bounds);
tv.Draw ();
TestHelpers.AssertDriverContentsWithFrameAre (@"
┌──┐
@@ -655,7 +655,7 @@ namespace Terminal.Gui.ViewsTests {
tv.ApplyStyleChanges ();
tv.LayoutSubviews ();
tv.Redraw (tv.Bounds);
tv.Draw ();
TestHelpers.AssertDriverContentsWithFrameAre (@"
┌─┐
@@ -675,7 +675,7 @@ namespace Terminal.Gui.ViewsTests {
tv.ApplyStyleChanges ();
tv.LayoutSubviews ();
tv.Redraw (tv.Bounds);
tv.Draw ();
TestHelpers.AssertDriverContentsWithFrameAre (@"
┌─┐
@@ -697,7 +697,7 @@ namespace Terminal.Gui.ViewsTests {
tab1.Text = "Tab0";
tab2.Text = "Les Mise" + Char.ConvertFromUtf32 (Int32.Parse ("0301", NumberStyles.HexNumber)) + "rables";
tv.Redraw (tv.Bounds);
tv.Draw ();
TestHelpers.AssertDriverContentsWithFrameAre (@"
┌────┐
@@ -708,7 +708,7 @@ namespace Terminal.Gui.ViewsTests {
tv.SelectedTab = tab2;
tv.Redraw (tv.Bounds);
tv.Draw ();
TestHelpers.AssertDriverContentsWithFrameAre (@"
┌──────────────┐
@@ -732,7 +732,7 @@ namespace Terminal.Gui.ViewsTests {
tab1.Text = "Tab0";
tab2.Text = "Les Mise" + Char.ConvertFromUtf32 (Int32.Parse ("0301", NumberStyles.HexNumber)) + "rables";
tv.Redraw (tv.Bounds);
tv.Draw ();
TestHelpers.AssertDriverContentsWithFrameAre (@"
┌──────────────────┐
@@ -743,7 +743,7 @@ namespace Terminal.Gui.ViewsTests {
tv.SelectedTab = tab2;
tv.Redraw (tv.Bounds);
tv.Draw ();
TestHelpers.AssertDriverContentsWithFrameAre (@"
┌──────────────────┐
@@ -763,7 +763,7 @@ namespace Terminal.Gui.ViewsTests {
tv.LayoutSubviews ();
tv.Redraw (tv.Bounds);
tv.Draw ();
var tabRow = tv.Subviews[0];
Assert.Equal("TabRowView",tabRow.GetType().Name);