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

text,widget,opentype: change text.Face.Shape to return a clip.PathSpec

Browse Source 
With this change, the Shape function returns a clip.PathSpec
instead of a clip.Outline op. It is then possible to create
a clip.Outline or clip.Stroke op to fill the text path or
draw its stroke.

Signed-off-by: Christophe Meessen <meessen@cppm.in2p3.fr>
This commit is contained in:
Christophe Meessen
2021-12-16 17:15:01 +01:00
committed by Elias Naur
parent 3db11cbaad
commit a34e239c04
8 changed files with 25 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files
widget/editor.go
+2 -2
View File
@@ -531,8 +531,8 @@ func (e *Editor) layout(gtx layout.Context, content layout.Widget) layout.Dimens
if !ok {
break
}
path := e.shaper.Shape(e.font, e.textSize, layout)
e.shapes = append(e.shapes, line{off, path, selected, yOffs, size})
op := clip.Outline{Path: e.shaper.Shape(e.font, e.textSize, layout)}.Op()
e.shapes = append(e.shapes, line{off, op, selected, yOffs, size})
}
key.InputOp{Tag: &e.eventKey, Hint: e.InputHint}.Add(gtx.Ops)
widget/label.go
+1 -1
View File
@@ -179,7 +179,7 @@ func (l Label) Layout(gtx layout.Context, s text.Shaper, font text.Font, size un
}
t := op.Offset(layout.FPt(off)).Push(gtx.Ops)
rcl := clip.Rect(cl.Sub(off)).Push(gtx.Ops)
cl := s.Shape(font, textSize, l).Push(gtx.Ops)
cl := clip.Outline{Path: s.Shape(font, textSize, l)}.Op().Push(gtx.Ops)
paint.PaintOp{}.Add(gtx.Ops)
cl.Pop()
rcl.Pop()