joejulian/gio
1
0
Fork 1
mirror of https://git.sr.ht/~eliasnaur/gio synced 2026-07-06 09:55:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

ui/measure: document and export Face

Browse Source 
Signed-off-by: Elias Naur <mail@eliasnaur.com>
This commit is contained in:
Elias Naur
2019-08-11 19:14:53 +02:00
parent 5c3dcc6f9a
commit 628a97cd71
1 changed files with 16 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ui/measure/measure.go
+16 -8
View File
@@ -1,5 +1,8 @@
// SPDX-License-Identifier: Unlicense OR MIT // SPDX-License-Identifier: Unlicense OR MIT
/*
Package measure implements text layout and shaping.
*/
package measure package measure
import ( import (
@@ -9,16 +12,17 @@ import (
"gioui.org/ui" "gioui.org/ui"
"gioui.org/ui/f32" "gioui.org/ui/f32"
"gioui.org/ui/text"
"gioui.org/ui/paint" "gioui.org/ui/paint"
"gioui.org/ui/text"
"golang.org/x/image/font" "golang.org/x/image/font"
"golang.org/x/image/font/sfnt" "golang.org/x/image/font/sfnt"
"golang.org/x/image/math/fixed" "golang.org/x/image/math/fixed"
) )
// Faces is a cache of text layouts and paths.
type Faces struct { type Faces struct {
config ui.Config config ui.Config
faceCache map[faceKey]*textFace faceCache map[faceKey]*Face
layoutCache map[layoutKey]cachedLayout layoutCache map[layoutKey]cachedLayout
pathCache map[pathKey]cachedPath pathCache map[pathKey]cachedPath
} }
@@ -51,12 +55,15 @@ type faceKey struct {
size ui.Value size ui.Value
} }
type textFace struct { // Face is a cached implementation of text.Face.
type Face struct {
faces *Faces faces *Faces
size ui.Value size ui.Value
font *opentype font *opentype
} }
// Reset the cache, discarding any measures or paths that
// haven't been used since the last call to Reset.
func (f *Faces) Reset(c ui.Config) { func (f *Faces) Reset(c ui.Config) {
f.config = c f.config = c
f.init() f.init()
@@ -78,13 +85,14 @@ func (f *Faces) Reset(c ui.Config) {
} }
} }
func (f *Faces) For(fnt *sfnt.Font, size ui.Value) text.Face { // For returns a Face for the given font and size.
func (f *Faces) For(fnt *sfnt.Font, size ui.Value) *Face {
f.init() f.init()
fk := faceKey{fnt, size} fk := faceKey{fnt, size}
if f, exist := f.faceCache[fk]; exist { if f, exist := f.faceCache[fk]; exist {
return f return f
} }
face := &textFace{ face := &Face{
faces: f, faces: f,
size: size, size: size,
font: &opentype{Font: fnt, Hinting: font.HintingFull}, font: &opentype{Font: fnt, Hinting: font.HintingFull},
@@ -97,12 +105,12 @@ func (f *Faces) init() {
if f.faceCache != nil { if f.faceCache != nil {
return return
} }
f.faceCache = make(map[faceKey]*textFace) f.faceCache = make(map[faceKey]*Face)
f.pathCache = make(map[pathKey]cachedPath) f.pathCache = make(map[pathKey]cachedPath)
f.layoutCache = make(map[layoutKey]cachedLayout) f.layoutCache = make(map[layoutKey]cachedLayout)
} }
func (f *textFace) Layout(str string, opts text.LayoutOptions) *text.Layout { func (f *Face) Layout(str string, opts text.LayoutOptions) *text.Layout {
ppem := fixed.Int26_6(f.faces.config.Px(f.size) * 64) ppem := fixed.Int26_6(f.faces.config.Px(f.size) * 64)
lk := layoutKey{ lk := layoutKey{
f: f.font.Font, f: f.font.Font,
@@ -120,7 +128,7 @@ func (f *textFace) Layout(str string, opts text.LayoutOptions) *text.Layout {
return l return l
} }
func (f *textFace) Path(str text.String) ui.MacroOp { func (f *Face) Path(str text.String) ui.MacroOp {
ppem := fixed.Int26_6(f.faces.config.Px(f.size) * 64) ppem := fixed.Int26_6(f.faces.config.Px(f.size) * 64)
pk := pathKey{ pk := pathKey{
f: f.font.Font, f: f.font.Font,