joejulian/gio
1
0
Fork 1
mirror of https://git.sr.ht/~eliasnaur/gio synced 2026-07-05 01:15:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

widget: use reliable text direction checks, not heuristics

Browse Source 
This commit switches the way in which the editor and helper functions check
for RTL text from a heuristic to using the actual text direction.

Signed-off-by: Chris Waldon <christopher.waldon.dev@gmail.com>
This commit is contained in:
Chris Waldon
2022-10-17 08:56:24 -04:00
committed by Elias Naur
parent bebc73db37
commit b46c0f5907
2 changed files with 1 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
widget/editor.go
-3
View File
@@ -794,9 +794,6 @@ func (e *Editor) PaintText(gtx layout.Context) {
start, end := clipLine(e.lines, e.Alignment, e.viewSize.X, cl, pos) start, end := clipLine(e.lines, e.Alignment, e.viewSize.X, cl, pos)
line := e.lines[start.lineCol.Y] line := e.lines[start.lineCol.Y]
off := image.Point{X: start.x.Floor(), Y: start.y}.Sub(scroll) off := image.Point{X: start.x.Floor(), Y: start.y}.Sub(scroll)
if start.lineCol.X > end.lineCol.X {
start, end = end, start
}
l := subLayout(line, start, end) l := subLayout(line, start, end)
t := op.Offset(off).Push(gtx.Ops) t := op.Offset(off).Push(gtx.Ops)
widget/label.go
+1 -5
View File
@@ -68,13 +68,9 @@ func clipLine(lines []text.Line, alignment text.Alignment, width int, clip image
} }
func subLayout(line text.Line, start, end combinedPos) text.Layout { func subLayout(line text.Line, start, end combinedPos) text.Layout {
if start.lineCol.X == line.Layout.Runes.Count {
return text.Layout{}
}
startCluster := clusterIndexFor(line, start.lineCol.X, start.clusterIndex) startCluster := clusterIndexFor(line, start.lineCol.X, start.clusterIndex)
endCluster := clusterIndexFor(line, end.lineCol.X, end.clusterIndex) endCluster := clusterIndexFor(line, end.lineCol.X, end.clusterIndex)
if startCluster > endCluster { if line.Layout.Direction.Progression() == system.TowardOrigin {
startCluster, endCluster = endCluster, startCluster startCluster, endCluster = endCluster, startCluster
} }
return line.Layout.Slice(startCluster, endCluster) return line.Layout.Slice(startCluster, endCluster)