Merge pull request #22 from matsuyoshi30/fix-width

Fix width calculation
matsuyoshi30 · Aug 11, 2021 · b9dcd82 · b9dcd82
2 parents 31472af + eb2f629
commit b9dcd82
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/panel.go b/panel.go
@@ -54,7 +54,6 @@ type Labeler interface {
 
 func NewImage(src string, face font.Face, noWindowAccessBar bool) *Panel {
 	ml := MaxLine(src)
-	ml = strings.ReplaceAll(ml, "\t", "    ") // replace tab to whitespace
 	ml = ml + " "
 
 	width := CalcWidth(font.MeasureString(face, " ").Ceil() * len(ml))

diff --git a/util.go b/util.go
@@ -30,6 +30,8 @@ func ReadString(r io.Reader, face font.Face) (string, error) {
 }
 
 func MaxLine(s string) string {
+	s = strings.ReplaceAll(s, "\t", "    ") // replace tab to whitespace
+
 	var ret string
 	for _, line := range strings.Split(s, "\n") {
 		if utf8.RuneCountInString(ret) < utf8.RuneCountInString(line) {