tslocum/etk
1
0
Fork 0
Code Issues 3 Pull requests Projects Releases Wiki Activity

Fix wrapping UTF-8 characters

Browse source
This commit is contained in:
Trevor Slocum 2024-10-30 13:13:29 -07:00
parent cb1ced340f
commit 7674cd8c59
1 changed files with 19 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
messeji/textfield.go
View file

@ -864,15 +864,16 @@ func (f *TextField) wrapContent(withScrollBar bool) {
var lastSpace int
var bounds fixed.Rectangle26_6
var boundsWidth int
WRAPTEXT:
for start < l {
lastSpace = -1
for e := range line[start:] {
if unicode.IsSpace(rune(line[start+e])) {
for e, r := range line[start:] {
if unicode.IsSpace(r) {
lastSpace = start + e + 1
}
bounds, _ = font.BoundString(f.face, line[start:start+e+1])
bounds, _ = font.BoundString(f.face, line[start:start+e]+string(r))
boundsWidth = (bounds.Max.X - bounds.Min.X).Floor()
if boundsWidth > availableWidth || e == l-start-1 {
if boundsWidth > availableWidth {
original := e
if e != l-start-1 && e > 0 {
e--
@ -898,9 +899,22 @@ func (f *TextField) wrapContent(withScrollBar bool) {
j++
start = start + e + 1
break
continue WRAPTEXT
}
}
if len(f.bufferWrapped) <= j {
f.bufferWrapped = append(f.bufferWrapped, line[start:])
} else {
f.bufferWrapped[j] = line[start:]
}
if len(f.lineWidths) <= j {
f.lineWidths = append(f.lineWidths, boundsWidth)
} else {
f.lineWidths[j] = boundsWidth
}
j++
break
}
}