joejulian/gio-patched
1
0
Fork 0
forked from joejulian/gio
Code Pull Requests 1 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
text/shaper.go
+5 -5
View File
@@ -8,7 +8,7 @@ import (
"golang.org/x/image/math/fixed"
"gioui.org/op"
"gioui.org/op/clip"
)
// Shaper implements layout and shaping of text.
@@ -18,7 +18,7 @@ type Shaper interface {
// LayoutString is Layout for strings.
LayoutString(font Font, size fixed.Int26_6, maxWidth int, str string) []Line
// Shape a line of text and return a clipping operation for its outline.
Shape(font Font, size fixed.Int26_6, layout Layout) op.CallOp
Shape(font Font, size fixed.Int26_6, layout Layout) clip.Op
}
// A FontFace is a Font and a matching Face.
@@ -121,7 +121,7 @@ func (c *Cache) LayoutString(font Font, size fixed.Int26_6, maxWidth int, str st
// Shape is a caching implementation of the Shaper interface. Shape assumes that the layout
// argument is unchanged from a call to Layout or LayoutString.
func (c *Cache) Shape(font Font, size fixed.Int26_6, layout Layout) op.CallOp {
func (c *Cache) Shape(font Font, size fixed.Int26_6, layout Layout) clip.Op {
cache := c.lookup(font)
return cache.shape(size, layout)
}
@@ -143,9 +143,9 @@ func (f *faceCache) layout(ppem fixed.Int26_6, maxWidth int, str string) []Line
return l
}
func (f *faceCache) shape(ppem fixed.Int26_6, layout Layout) op.CallOp {
func (f *faceCache) shape(ppem fixed.Int26_6, layout Layout) clip.Op {
if f == nil {
return op.CallOp{}
return clip.Op{}
}
pk := pathKey{
ppem: ppem,