cmd/tailscale: bump gio version

Signed-off-by: Elias Naur <mail@eliasnaur.com>

cmd/tailscale/main.go

@@ -16,8 +16,6 @@ import (
 	"gioui.org/layout"
 	"gioui.org/op"
 
-	"gioui.org/font/gofont"
-
 	"tailscale.com/control/controlclient"
 	"tailscale.com/ipn"
 	"tailscale.com/tailcfg"
@@ -376,7 +374,6 @@ func (a *App) setURL(url string) {
 
 func (a *App) runUI() error {
 	w := app.NewWindow()
-	gofont.Register()
 	ui, err := newUI(a.store)
 	if err != nil {
 		return err

cmd/tailscale/ui.go

@@ -13,6 +13,7 @@ import (
 	"time"
 
 	"gioui.org/f32"
+	"gioui.org/font/gofont"
 	"gioui.org/io/pointer"
 	"gioui.org/io/system"
 	"gioui.org/layout"
@@ -120,7 +121,7 @@ func newUI(store *stateStore) (*UI, error) {
 		return nil, err
 	}
 	ui := &UI{
-		theme: material.NewTheme(),
+		theme: material.NewTheme(gofont.Collection()),
 		store: store,
 	}
 	ui.intro.show, _ = store.ReadBool(keyShowIntro, true)

go.mod

@@ -3,7 +3,7 @@ module tailscale.com/tailscale-android
 go 1.14
 
 require (
-	gioui.org v0.0.0-20200602143738-d489c20b8421
+	gioui.org v0.0.0-20200608155540-1ace1392d655
 	gioui.org/cmd v0.0.0-20200530141830-d2c67cdf8039
 	github.com/tailscale/wireguard-go v0.0.0-20200515231107-62868271d710
 	golang.org/x/exp v0.0.0-20191002040644-a1355ae1e2c3

go.sum

@@ -1,8 +1,8 @@
 cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
 dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU=
 gioui.org v0.0.0-20200530124200-1377bea3cdc5/go.mod h1:AHI9rFr6AEEHCb8EPVtb/p5M+NMJRKH58IOp8O3Je04=
-gioui.org v0.0.0-20200602143738-d489c20b8421 h1:/NywuUDhhmCUQfB7CnxS7TQZ9Fid5rQaBbhy6rv1FYM=
-gioui.org v0.0.0-20200602143738-d489c20b8421/go.mod h1:AHI9rFr6AEEHCb8EPVtb/p5M+NMJRKH58IOp8O3Je04=
+gioui.org v0.0.0-20200608155540-1ace1392d655 h1:ZbeBUjnpr1K25bD/Hc+dxYJj+LWNYeEGamSPiI0G4rI=
+gioui.org v0.0.0-20200608155540-1ace1392d655/go.mod h1:AHI9rFr6AEEHCb8EPVtb/p5M+NMJRKH58IOp8O3Je04=
 gioui.org/cmd v0.0.0-20200530141830-d2c67cdf8039 h1:mO1CTk+PwcDQGMXpN1JJiFflYBvwqSQ6+3Gvp64IKHo=
 gioui.org/cmd v0.0.0-20200530141830-d2c67cdf8039/go.mod h1:B1g+HOceSj7g3S4Yao3skwInTpcK978KANys5YuapMc=
 github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=