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

text: remove Metrics from Face interface

Browse Source 
It's not used in text shaping, so let's not require it.

Note that the concrete opentype package still retains the Metrics
implementation.

Signed-off-by: Elias Naur <mail@eliasnaur.com>
This commit is contained in:
Elias Naur
2020-06-26 10:44:19 +02:00
parent db03b0898d
commit 913a780d64
2 changed files with 0 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
text/shaper.go
-14
View File
@@ -6,8 +6,6 @@ import (
"io"
"strings"
"golang.org/x/image/font"
"gioui.org/op"
"golang.org/x/image/math/fixed"
)
@@ -23,9 +21,6 @@ type Shaper interface {
LayoutString(font Font, size fixed.Int26_6, maxWidth int, str string) []Line
// ShapeString is like Shape for lines previously laid out by LayoutString.
ShapeString(font Font, size fixed.Int26_6, str string, layout []Glyph) op.CallOp
// Metrics returns the font metrics for font.
Metrics(font Font, size fixed.Int26_6) font.Metrics
}
// A FontFace is a Font and a matching Face.
@@ -120,11 +115,6 @@ func (s *Cache) ShapeString(font Font, size fixed.Int26_6, str string, layout []
return cache.shape(size, str, layout)
}
func (s *Cache) Metrics(font Font, size fixed.Int26_6) font.Metrics {
cache := s.lookup(font)
return cache.metrics(size)
}
func (f *faceCache) layout(ppem fixed.Int26_6, maxWidth int, str string) []Line {
if f == nil {
return nil
@@ -157,7 +147,3 @@ func (f *faceCache) shape(ppem fixed.Int26_6, str string, layout []Glyph) op.Cal
f.pathCache.Put(pk, clip)
return clip
}
func (f *faceCache) metrics(ppem fixed.Int26_6) font.Metrics {
return f.face.Metrics(ppem)
}