tk/spectre.console
1
0
Fork 0
mirror of https://github.com/nsnail/spectre.console.git synced 2025-07-04 11:48:16 +08:00
Code Issues Packages Projects Releases Wiki Activity

Use Wcwidth library

Browse Source
This commit is contained in:
Patrik Svensson
2020-09-17 11:18:27 +02:00
committed by Patrik Svensson
parent df291ef84e
commit 090b30f731
11 changed files with 43 additions and 172 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -101,7 +101,7 @@ namespace Spectre.Console
content.AddRange(line);
// Do we need to pad the panel?
var length = line.Sum(segment => segment.CellLength(context.Encoding));
var length = line.Sum(segment => segment.CellLength(context));
if (length < childWidth)
{
var diff = childWidth - length;
@ -138,9 +138,9 @@ namespace Spectre.Console
var rightSpacing = 0;
var headerWidth = panelWidth - (EdgeWidth * 2);
var header = Segment.TruncateWithEllipsis(Header.Text, Header.Style ?? borderStyle, context.Encoding, headerWidth);
var header = Segment.TruncateWithEllipsis(Header.Text, Header.Style ?? borderStyle, context, headerWidth);
var excessWidth = headerWidth - header.CellLength(context.Encoding);
var excessWidth = headerWidth - header.CellLength(context);
if (excessWidth > 0)
{
switch (Header.Alignment ?? Justify.Left)