Merge pull request #527 from pterm/526-wrong-print-of-box-with-title-…

…including-asian-characters
pterm · Jun 18, 2023 · 156868c · 156868c
2 parents 20d3f63 + 0a7e718
commit 156868c
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 7 deletions.
diff --git a/box_printer.go b/box_printer.go
@@ -240,8 +240,8 @@ func (p BoxPrinter) Sprint(a ...interface{}) string {
 			maxWidth+p.LeftPadding+p.RightPadding) + p.BoxStyle.Sprint(p.TopLeftCornerString)
 	} else {
 		p.Title = strings.ReplaceAll(p.Title, "\n", " ")
-		if (maxWidth + p.RightPadding + p.LeftPadding - 4) < len(RemoveColorFromString(p.Title)) {
-			p.RightPadding = len(RemoveColorFromString(p.Title)) - (maxWidth + p.RightPadding + p.LeftPadding - 5)
+		if (maxWidth + p.RightPadding + p.LeftPadding - 4) < internal.GetStringMaxWidth(p.Title) {
+			p.RightPadding = internal.GetStringMaxWidth(p.Title) - (maxWidth + p.RightPadding + p.LeftPadding - 5)
 		}
 		if p.TitleTopLeft {
 			topLine = p.BoxStyle.Sprint(p.BottomRightCornerString) + internal.AddTitleToLine(p.Title, p.BoxStyle.Sprint(p.HorizontalString), maxWidth+p.LeftPadding+p.RightPadding, true) + p.BoxStyle.Sprint(p.BottomLeftCornerString)

diff --git a/internal/title_in_line.go b/internal/title_in_line.go
@@ -2,17 +2,15 @@ package internal
 
 import (
 	"strings"
-
-	"github.com/gookit/color"
 )
 
 // AddTitleToLine adds a title to a site of a line ex: "─ This is the title ──────"
 func AddTitleToLine(title, line string, length int, left bool) string {
 	var ret string
 	if left {
-		ret += line + " " + title + " " + line + strings.Repeat(line, length-(4+len(color.ClearCode(title))))
+		ret += line + " " + title + " " + line + strings.Repeat(line, length-(4+GetStringMaxWidth(title)))
 	} else {
-		ret += strings.Repeat(line, length-(4+len(color.ClearCode(title)))) + line + " " + title + " " + line
+		ret += strings.Repeat(line, length-(4+GetStringMaxWidth(title))) + line + " " + title + " " + line
 	}
 
 	return ret
@@ -21,7 +19,7 @@ func AddTitleToLine(title, line string, length int, left bool) string {
 // AddTitleToLineCenter adds a title to the center of a line ex: "─ This is the title ──────"
 func AddTitleToLineCenter(title, line string, length int) string {
 	var ret string
-	repeatString := length - (4 + len(color.ClearCode(title)))
+	repeatString := length - (4 + GetStringMaxWidth(title))
 	unevenRepeatString := repeatString % 2
 
 	ret += strings.Repeat(line, repeatString/2) + line + " " + title + " " + line + strings.Repeat(line, repeatString/2+unevenRepeatString)