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

text: make text size implicit

Browse Source 
Signed-off-by: Elias Naur <mail@eliasnaur.com>
This commit is contained in:
Elias Naur
2019-10-05 11:22:26 +02:00
parent f230036cad
commit b4a52d3010
4 changed files with 65 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files
text/shape/measure.go
+8 -14
View File
@@ -14,7 +14,6 @@ import (
"gioui.org/op"
"gioui.org/op/paint"
"gioui.org/text"
"gioui.org/unit"
"golang.org/x/image/font"
"golang.org/x/image/font/sfnt"
"golang.org/x/image/math/fixed"
@@ -22,7 +21,6 @@ import (
// Faces is a cache of text layouts and paths.
type Faces struct {
config unit.Converter
faceCache map[faceKey]*Face
layoutCache map[layoutKey]cachedLayout
pathCache map[pathKey]cachedPath
@@ -53,20 +51,17 @@ type pathKey struct {
type faceKey struct {
font *sfnt.Font
size unit.Value
}
// Face is a cached implementation of text.Face.
type Face struct {
faces *Faces
size unit.Value
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 unit.Converter) {
f.config = c
func (f *Faces) Reset() {
f.init()
for pk, p := range f.pathCache {
if !p.active {
@@ -86,16 +81,15 @@ func (f *Faces) Reset(c unit.Converter) {
}
}
// For returns a Face for the given font and size.
func (f *Faces) For(fnt *sfnt.Font, size unit.Value) *Face {
// For returns a Face for the given font.
func (f *Faces) For(fnt *sfnt.Font) *Face {
f.init()
fk := faceKey{fnt, size}
fk := faceKey{fnt}
if f, exist := f.faceCache[fk]; exist {
return f
}
face := &Face{
faces: f,
size: size,
font: &opentype{Font: fnt, Hinting: font.HintingFull},
}
f.faceCache[fk] = face
@@ -111,8 +105,8 @@ func (f *Faces) init() {
f.layoutCache = make(map[layoutKey]cachedLayout)
}
func (f *Face) Layout(str string, opts text.LayoutOptions) *text.Layout {
ppem := fixed.Int26_6(f.faces.config.Px(f.size) * 64)
func (f *Face) Layout(size float32, str string, opts text.LayoutOptions) *text.Layout {
ppem := fixed.Int26_6(size * 64)
lk := layoutKey{
f: f.font.Font,
ppem: ppem,
@@ -129,8 +123,8 @@ func (f *Face) Layout(str string, opts text.LayoutOptions) *text.Layout {
return l
}
func (f *Face) Path(str text.String) op.MacroOp {
ppem := fixed.Int26_6(f.faces.config.Px(f.size) * 64)
func (f *Face) Path(size float32, str text.String) op.MacroOp {
ppem := fixed.Int26_6(size * 64)
pk := pathKey{
f: f.font.Font,
ppem: ppem,