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

font/opentype,text,widget: use clip.Op for text shapes, not a macro

Browse Source 
This change avoids a macro wrapping every text shape, and prepares text
shaping for scoped clip operations.

Signed-off-by: Elias Naur <mail@eliasnaur.com>
This commit is contained in:
Elias Naur
2021-10-02 18:11:31 +02:00
parent cd5a78f3d8
commit c1298cd755
7 changed files with 26 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files
font/opentype/opentype.go
+5 -7
View File
@@ -119,7 +119,7 @@ func (f *Font) Layout(ppem fixed.Int26_6, maxWidth int, txt io.Reader) ([]text.L
return layoutText(&buf, ppem, maxWidth, fonts, glyphs)
}
func (f *Font) Shape(ppem fixed.Int26_6, str text.Layout) op.CallOp {
func (f *Font) Shape(ppem fixed.Int26_6, str text.Layout) clip.Op {
var buf sfnt.Buffer
return textPath(&buf, ppem, []*opentype{{Font: f.font, Hinting: font.HintingFull}}, str)
}
@@ -139,7 +139,7 @@ func (c *Collection) Layout(ppem fixed.Int26_6, maxWidth int, txt io.Reader) ([]
return layoutText(&buf, ppem, maxWidth, c.fonts, glyphs)
}
func (c *Collection) Shape(ppem fixed.Int26_6, str text.Layout) op.CallOp {
func (c *Collection) Shape(ppem fixed.Int26_6, str text.Layout) clip.Op {
var buf sfnt.Buffer
return textPath(&buf, ppem, c.fonts, str)
}
@@ -261,11 +261,10 @@ func toLayout(glyphs []glyph) text.Layout {
return text.Layout{Text: buf.String(), Advances: advs}
}
func textPath(buf *sfnt.Buffer, ppem fixed.Int26_6, fonts []*opentype, str text.Layout) op.CallOp {
func textPath(buf *sfnt.Buffer, ppem fixed.Int26_6, fonts []*opentype, str text.Layout) clip.Op {
var lastPos f32.Point
var builder clip.Path
ops := new(op.Ops)
m := op.Record(ops)
var x fixed.Int26_6
builder.Begin(ops)
rune := 0
@@ -324,10 +323,9 @@ func textPath(buf *sfnt.Buffer, ppem fixed.Int26_6, fonts []*opentype, str text.
x += str.Advances[rune]
rune++
}
clip.Outline{
return clip.Outline{
Path: builder.End(),
}.Op().Add(ops)
return m.Stop()
}.Op()
}
func readGlyphs(r io.Reader) ([]glyph, error) {