@@ 14,8 14,7 @@ import (
"unicode/utf8"
"gioui.org/f32"
- "gioui.org/font"
- "gioui.org/font/opentype"
+ "gioui.org/font/gofont"
"gioui.org/gpu"
"gioui.org/internal/ops"
"gioui.org/io/event"
@@ 29,7 28,6 @@ import (
"gioui.org/unit"
"gioui.org/widget"
"gioui.org/widget/material"
- "golang.org/x/image/font/gofont/goregular"
_ "gioui.org/app/internal/log"
)
@@ 142,8 140,7 @@ type queue struct {
func NewWindow(options ...Option) *Window {
// Measure decoration height.
deco := new(widget.Decorations)
- face, _ := opentype.Parse(goregular.TTF)
- theme := material.NewTheme([]font.FontFace{{Font: font.Font{Typeface: "Go"}, Face: face}})
+ theme := material.NewTheme(gofont.Regular())
decoStyle := material.Decorations(theme, deco, 0, "")
gtx := layout.Context{
Ops: new(op.Ops),