Adds ShowHorizontalBottomline (#2552)

Terminal.Gui/Views/TableView/TableView.cs

@@ -278,9 +278,18 @@ namespace Terminal.Gui {
 				var rowToRender = RowOffset + (line - headerLinesConsumed);
 
 				//if we have run off the end of the table
-				if (TableIsNullOrInvisible () || rowToRender >= Table.Rows.Count || rowToRender < 0)
+				if (TableIsNullOrInvisible () || rowToRender < 0)
 					continue;
 
+				// No more data
+				if(rowToRender >= Table.Rows.Count) {
+
+					if(rowToRender == Table.Rows.Count && Style.ShowHorizontalBottomline) {
+						RenderBottomLine (line, bounds.Width, columnsToRender);
+					}
+					continue;
+				}
+
 				RenderRow (line, rowToRender, columnsToRender);
 			}
 		}
@@ -474,6 +483,43 @@ namespace Terminal.Gui {
 			}
 
 		}
+
+		private void RenderBottomLine (int row, int availableWidth, ColumnToRender [] columnsToRender)
+		{
+			// Renders a line at the bottom of the table after all the data like:
+			// └─────────────────────────────────┴──────────┴──────┴──────────┴────────┴────────────────────────────────────────────┘
+
+			for (int c = 0; c < availableWidth; c++) {
+
+				// Start by assuming we just draw a straight line the
+				// whole way but update to instead draw BottomTee / Corner etc
+				var rune = Driver.HLine;
+
+				if (Style.ShowVerticalCellLines) {
+					if (c == 0) {
+						// for first character render line
+						rune = Driver.LLCorner;
+
+					}
+					// if the next column is the start of a header
+					else if (columnsToRender.Any (r => r.X == c + 1)) {
+						rune =  Driver.BottomTee;
+					} else if (c == availableWidth - 1) {
+
+						// for the last character in the table
+						rune = Driver.LRCorner;
+
+					}
+					  // if the next console column is the lastcolumns end
+					  else if (Style.ExpandLastColumn == false &&
+							  columnsToRender.Any (r => r.IsVeryLast && r.X + r.Width - 1 == c)) {
+						rune = Driver.BottomTee;
+					}
+				}
+
+				AddRuneAt (Driver, c, row, rune);
+			}
+		}
 		private void RenderRow (int row, int rowToRender, ColumnToRender [] columnsToRender)
 		{
 			var focused = HasFocus;
@@ -1787,6 +1833,13 @@ namespace Terminal.Gui {
 			/// </summary>
 			public bool ShowHorizontalScrollIndicators { get; set; } = true;
 
+			
+			/// <summary>
+			/// Gets or sets a flag indicating whether there should be a horizontal line after all the data
+			/// in the table. Defaults to <see langword="false"/>.
+			/// </summary>
+			public bool ShowHorizontalBottomline { get; set; } = false;
+
 			/// <summary>
 			/// True to invert the colors of the first symbol of the selected cell in the <see cref="TableView"/>.
 			/// This gives the appearance of a cursor for when the <see cref="ConsoleDriver"/> doesn't otherwise show

UICatalog/Scenarios/TableEditor.cs

@@ -27,6 +27,7 @@ namespace UICatalog.Scenarios {
 		private MenuItem miSmoothScrolling;
 		private MenuItem miAlternatingColors;
 		private MenuItem miCursor;
+		private MenuItem miBottomline;
 
 		ColorScheme redColorScheme;
 		ColorScheme redColorSchemeAlt;
@@ -59,6 +60,7 @@ namespace UICatalog.Scenarios {
 					miHeaderOverline = new MenuItem ("_HeaderOverLine", "", () => ToggleOverline()){Checked = tableView.Style.ShowHorizontalHeaderOverline, CheckType = MenuItemCheckStyle.Checked },
 					miHeaderMidline = new MenuItem ("_HeaderMidLine", "", () => ToggleHeaderMidline()){Checked = tableView.Style.ShowVerticalHeaderLines, CheckType = MenuItemCheckStyle.Checked },
 					miHeaderUnderline = new MenuItem ("_HeaderUnderLine", "", () => ToggleUnderline()){Checked = tableView.Style.ShowHorizontalHeaderUnderline, CheckType = MenuItemCheckStyle.Checked },
+					miBottomline = new MenuItem ("_BottomLine", "", () => ToggleBottomline()){Checked = tableView.Style.ShowHorizontalBottomline, CheckType = MenuItemCheckStyle.Checked },
 					miShowHorizontalScrollIndicators = new MenuItem ("_HorizontalScrollIndicators", "", () => ToggleHorizontalScrollIndicators()){Checked = tableView.Style.ShowHorizontalScrollIndicators, CheckType = MenuItemCheckStyle.Checked },
 					miFullRowSelect =new MenuItem ("_FullRowSelect", "", () => ToggleFullRowSelect()){Checked = tableView.FullRowSelect, CheckType = MenuItemCheckStyle.Checked },
 					miCellLines =new MenuItem ("_CellLines", "", () => ToggleCellLines()){Checked = tableView.Style.ShowVerticalCellLines, CheckType = MenuItemCheckStyle.Checked },
@@ -397,6 +399,12 @@ namespace UICatalog.Scenarios {
 			tableView.Style.ShowHorizontalHeaderUnderline = (bool)miHeaderUnderline.Checked;
 			tableView.Update ();
 		}
+		private void ToggleBottomline()
+		{
+			miBottomline.Checked = !miBottomline.Checked;
+			tableView.Style.ShowHorizontalBottomline = (bool)miBottomline.Checked;
+			tableView.Update ();
+		}
 		private void ToggleHorizontalScrollIndicators ()
 		{
 			miShowHorizontalScrollIndicators.Checked = !miShowHorizontalScrollIndicators.Checked;

UnitTests/Views/TableViewTests.cs

@@ -1991,6 +1991,68 @@ namespace Terminal.Gui.ViewsTests {
 
 		}
 
+
+		[Fact, AutoInitShutdown]
+		public void ShowHorizontalBottomLine_WithVerticalCellLines ()
+		{
+			var tableView = GetABCDEFTableView(out _);
+			tableView.BeginInit (); tableView.EndInit ();
+
+			tableView.ColorScheme = Colors.TopLevel;
+
+			// 3 columns are visibile
+			tableView.Bounds = new Rect (0, 0, 7, 5);
+			tableView.Style.ShowHorizontalHeaderUnderline = true;
+			tableView.Style.ShowHorizontalHeaderOverline = false;
+			tableView.Style.AlwaysShowHeaders = true;
+			tableView.Style.SmoothHorizontalScrolling = true;
+			tableView.Style.ShowHorizontalBottomline = true;
+						
+			tableView.Redraw (tableView.Bounds);
+
+			// user can only scroll right so sees right indicator
+			// Because first column in table is A
+			string expected =
+				@"
+│A│B│C│
+├─┼─┼─►
+│1│2│3│
+└─┴─┴─┘";
+
+			TestHelpers.AssertDriverContentsAre (expected, output);
+		}
+		[Fact, AutoInitShutdown]
+		public void ShowHorizontalBottomLine_NoCellLines ()
+		{
+			var tableView = GetABCDEFTableView (out _);
+			tableView.BeginInit (); tableView.EndInit ();
+
+			tableView.ColorScheme = Colors.TopLevel;
+
+			// 3 columns are visibile
+			tableView.Bounds = new Rect (0, 0, 7, 5);
+			tableView.Style.ShowHorizontalHeaderUnderline = true;
+			tableView.Style.ShowHorizontalHeaderOverline = false;
+			tableView.Style.AlwaysShowHeaders = true;
+			tableView.Style.SmoothHorizontalScrolling = true;
+			tableView.Style.ShowHorizontalBottomline = true;
+			tableView.Style.ShowVerticalCellLines = false;
+
+			tableView.Redraw (tableView.Bounds);
+
+			// user can only scroll right so sees right indicator
+			// Because first column in table is A
+			string expected =
+				@"
+│A│B│C│
+└─┴─┴─►
+ 1 2 3
+───────";
+
+			TestHelpers.AssertDriverContentsAre (expected, output);
+		}
+
+
 		/// <summary>
 		/// Builds a simple table of string columns with the requested number of columns and rows
 		/// </summary>