From 90e2a119c04b0dd76f9d195a6b5b8d0b9c32d937 Mon Sep 17 00:00:00 2001 From: Elias Naur Date: Thu, 26 Sep 2019 18:43:21 +0200 Subject: [PATCH] apps/gophers: update gio version Signed-off-by: Elias Naur --- apps/go.mod | 2 +- apps/go.sum | 4 ++-- apps/gophers/main_test.go | 4 ++-- apps/gophers/ui.go | 4 ++-- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/apps/go.mod b/apps/go.mod index 11251297..7d3ac1ed 100644 --- a/apps/go.mod +++ b/apps/go.mod @@ -3,7 +3,7 @@ module gioui.org/apps go 1.13 require ( - gioui.org/ui v0.0.0-20190924202410-3944ef4b2e46 + gioui.org/ui v0.0.0-20190926164103-dc6fedc163d5 github.com/google/go-github/v24 v24.0.1 golang.org/x/exp v0.0.0-20190627132806-fd42eb6b336f golang.org/x/image v0.0.0-20190703141733-d6a02ce849c9 diff --git a/apps/go.sum b/apps/go.sum index a51a4140..e40bd073 100644 --- a/apps/go.sum +++ b/apps/go.sum @@ -1,6 +1,6 @@ cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= -gioui.org/ui v0.0.0-20190924202410-3944ef4b2e46 h1:aNmeeRhiuvnWyM3YafyZ3XIHwl3qThBWJP0O2Nj2uCo= -gioui.org/ui v0.0.0-20190924202410-3944ef4b2e46/go.mod h1:PssKPKlqVIeyaed+0w492Xc2NgX5M3n6oZKOAj5rxoE= +gioui.org/ui v0.0.0-20190926164103-dc6fedc163d5 h1:Rj12+5VLuFgEvzbmHQ/PuzmoZ3CBc9jvVyPe5UkFWpQ= +gioui.org/ui v0.0.0-20190926164103-dc6fedc163d5/go.mod h1:PssKPKlqVIeyaed+0w492Xc2NgX5M3n6oZKOAj5rxoE= github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo= github.com/golang/protobuf v1.2.0 h1:P3YflyNX/ehuJFLhxviNdFxQPkGK5cDcApsge1SqnvM= github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= diff --git a/apps/gophers/main_test.go b/apps/gophers/main_test.go index 54b8d415..fa67321d 100644 --- a/apps/gophers/main_test.go +++ b/apps/gophers/main_test.go @@ -28,8 +28,8 @@ func BenchmarkUI(b *testing.B) { } } -func (queue) Next(k ui.Key) (ui.Event, bool) { - return nil, false +func (queue) Events(k ui.Key) []ui.Event { + return nil } func (config) Now() time.Time { diff --git a/apps/gophers/ui.go b/apps/gophers/ui.go index 773c2869..f99eac51 100644 --- a/apps/gophers/ui.go +++ b/apps/gophers/ui.go @@ -175,7 +175,7 @@ func (u *UI) layoutTimings(gtx *layout.Context) { if !u.profiling { return } - for e, ok := gtx.Next(u); ok; e, ok = gtx.Next(u) { + for _, e := range gtx.Events(u) { if e, ok := e.(system.ProfileEvent); ok { u.profile = e } @@ -197,7 +197,7 @@ func (u *UI) Layout(gtx *layout.Context) { u.faces.Reset(gtx) for i := range u.userClicks { click := &u.userClicks[i] - for e, ok := click.Next(gtx); ok; e, ok = click.Next(gtx) { + for _, e := range click.Events(gtx) { if e.Type == gesture.TypeClick { u.selectedUser = u.newUserPage(u.users[i]) }