fix drawing of wide characters in InfoWindow (#3919)

internal/display/infowindow.go

@@ -122,16 +122,8 @@ func (i *InfoWindow) displayBuffer() {
 
 			}
 
-			rw := runewidth.RuneWidth(r)
+			screen.SetContent(vlocX, i.Y, r, combc, style)
-			for j := 0; j < rw; j++ {
+			vlocX += runewidth.RuneWidth(r)
-				c := r
-				if j > 0 {
-					c = ' '
-					combc = nil
-				}
-				screen.SetContent(vlocX, i.Y, c, combc, style)
-			}
-			vlocX++
 		}
 		nColsBeforeStart--
 	}
@@ -142,29 +134,22 @@ func (i *InfoWindow) displayBuffer() {
 		curBX := blocX
 		r, combc, size := util.DecodeCharacter(line)
 
-		draw(r, combc, i.defStyle())
-
 		width := 0
 
-		char := ' '
 		switch r {
 		case '\t':
-			ts := tabsize - (totalwidth % tabsize)
+			width = tabsize - (totalwidth % tabsize)
-			width = ts
+			for j := 0; j < width; j++ {
+				draw(' ', nil, i.defStyle())
+			}
 		default:
 			width = runewidth.RuneWidth(r)
-			char = '@'
+			draw(r, combc, i.defStyle())
 		}
 
 		blocX++
 		line = line[size:]
 
-		// Draw any extra characters either spaces for tabs or @ for incomplete wide runes
-		if width > 1 {
-			for j := 1; j < width; j++ {
-				draw(char, nil, i.defStyle())
-			}
-		}
 		if activeC.X == curBX {
 			screen.ShowCursor(curVX, i.Y)
 		}