tk/spectre.console
1
0
Fork 0
mirror of https://github.com/nsnail/spectre.console.git synced 2025-06-19 13:28:16 +08:00
Code Issues Packages Projects Releases Wiki Activity

Do not draw tables that can't be drawn

Browse Source 
This is a temporary fix for undrawable tables until we've
implemented a proper strategy. What this does is that it replaces
an undrawable table with an ellipsis (...). This should only
occur in either super big tables or deeply nested tables in a
console with a small buffer width.
This commit is contained in:
Patrik Svensson
2020-10-18 07:27:37 +02:00
committed by Patrik Svensson
parent a2f507e58f
commit bfffef630f
6 changed files with 155 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/Spectre.Console/Widgets/Paragraph.cs
View File

@ -193,6 +193,12 @@ namespace Spectre.Console
private List<SegmentLine> SplitLines(RenderContext context, int maxWidth)
{
if (maxWidth <= 0)
{
// Nothing fits, so return an empty line.
return new List<SegmentLine>();
}
if (_lines.Max(x => x.CellWidth(context)) <= maxWidth)
{
return Clone();

31
src/Spectre.Console/Widgets/Table.cs
View File

@ -153,6 +153,7 @@ namespace Spectre.Console
var borderStyle = BorderStyle ?? Style.Plain;
var tableWidth = maxWidth;
var actualMaxWidth = maxWidth;
var showBorder = Border.Visible;
var hideBorder = !Border.Visible;
@ -170,6 +171,10 @@ namespace Spectre.Console
// Update the table width.
tableWidth = columnWidths.Sum() + GetExtraWidth(includePadding: true);
if (tableWidth <= 0 || tableWidth > actualMaxWidth || columnWidths.Any(c => c <= 0))
{
return new List<Segment>(new[] { new Segment("…", BorderStyle ?? Style.Plain) });
}
var rows = new List<List<IRenderable>>();
if (ShowHeaders)
@ -213,13 +218,15 @@ namespace Spectre.Console
// Iterate through each cell row
foreach (var cellRowIndex in Enumerable.Range(0, cellHeight))
{
var rowResult = new List<Segment>();
foreach (var (cellIndex, firstCell, lastCell, cell) in cells.Enumerate())
{
if (firstCell && showBorder)
{
// Show left column edge
var part = firstRow && ShowHeaders ? TableBorderPart.HeaderLeft : TableBorderPart.CellLeft;
result.Add(new Segment(border.GetPart(part), borderStyle));
rowResult.Add(new Segment(border.GetPart(part), borderStyle));
}
// Pad column on left side.
@ -228,18 +235,18 @@ namespace Spectre.Console
var leftPadding = _columns[cellIndex].Padding.Left;
if (leftPadding > 0)
{
result.Add(new Segment(new string(' ', leftPadding)));
rowResult.Add(new Segment(new string(' ', leftPadding)));
}
}
// Add content
result.AddRange(cell[cellRowIndex]);
rowResult.AddRange(cell[cellRowIndex]);
// Pad cell content right
var length = cell[cellRowIndex].Sum(segment => segment.CellLength(context));
if (length < columnWidths[cellIndex])
{
result.Add(new Segment(new string(' ', columnWidths[cellIndex] - length)));
rowResult.Add(new Segment(new string(' ', columnWidths[cellIndex] - length)));
}
// Pad column on the right side
@ -248,7 +255,7 @@ namespace Spectre.Console
var rightPadding = _columns[cellIndex].Padding.Right;
if (rightPadding > 0)
{
result.Add(new Segment(new string(' ', rightPadding)));
rowResult.Add(new Segment(new string(' ', rightPadding)));
}
}
@ -256,16 +263,26 @@ namespace Spectre.Console
{
// Add right column edge
var part = firstRow && ShowHeaders ? TableBorderPart.HeaderRight : TableBorderPart.CellRight;
result.Add(new Segment(border.GetPart(part), borderStyle));
rowResult.Add(new Segment(border.GetPart(part), borderStyle));
}
else if (showBorder)
{
// Add column separator
var part = firstRow && ShowHeaders ? TableBorderPart.HeaderSeparator : TableBorderPart.CellSeparator;
result.Add(new Segment(border.GetPart(part), borderStyle));
rowResult.Add(new Segment(border.GetPart(part), borderStyle));
}
}
// Is the row larger than the allowed max width?
if (Segment.CellLength(context, rowResult) > actualMaxWidth)
{
result.AddRange(Segment.Truncate(context, rowResult, actualMaxWidth));
}
else
{
result.AddRange(rowResult);
}
result.Add(Segment.LineBreak);
}

2
src/Spectre.Console/Widgets/TableColumn.cs
View File

@ -41,7 +41,7 @@ namespace Spectre.Console
/// </summary>
/// <param name="text">The table column text.</param>
public TableColumn(string text)
: this(new Markup(text))
: this(new Markup(text).SetOverflow(Overflow.Ellipsis))
{
}