OrgGo
/
tview
mirror of https://github.com/rivo/tview.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Avoiding infinite loop on narrow TextViews. Fixes #333

This commit is contained in:
Oliver 2019-10-17 12:07:41 +02:00
parent de7ae86b5b
commit c35e6b2b4c
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
textview.go
View File

@ -11,6 +11,7 @@ import (
"github.com/gdamore/tcell" "github.com/gdamore/tcell"
colorful "github.com/lucasb-eyer/go-colorful" colorful "github.com/lucasb-eyer/go-colorful"
runewidth "github.com/mattn/go-runewidth" runewidth "github.com/mattn/go-runewidth"
"github.com/rivo/uniseg"
) )
var ( var (
@ -599,6 +600,13 @@ func (t *TextView) reindexBuffer(width int) {
if t.wrap && len(str) > 0 { if t.wrap && len(str) > 0 {
for len(str) > 0 { for len(str) > 0 {
extract := runewidth.Truncate(str, width, "") extract := runewidth.Truncate(str, width, "")
if len(extract) == 0 {
// We'll extract at least one grapheme cluster.
gr := uniseg.NewGraphemes(str)
gr.Next()
_, to := gr.Positions()
extract = str[:to]
}
if t.wordWrap && len(extract) < len(str) { if t.wordWrap && len(extract) < len(str) {
// Add any spaces from the next line. // Add any spaces from the next line.
if spaces := spacePattern.FindStringIndex(str[len(extract):]); spaces != nil && spaces[0] == 0 { if spaces := spacePattern.FindStringIndex(str[len(extract):]); spaces != nil && spaces[0] == 0 {