diff --git a/example/go.mod b/example/go.mod index 2b0146fd..c04ecf08 100644 --- a/example/go.mod +++ b/example/go.mod @@ -3,7 +3,7 @@ module gioui.org/example go 1.13 require ( - gioui.org v0.0.0-20191014143932-b30bf3cef8b1 + gioui.org v0.0.0-20191014161730-8da2c9dbb4c4 github.com/google/go-github/v24 v24.0.1 golang.org/x/exp v0.0.0-20191002040644-a1355ae1e2c3 golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45 diff --git a/example/go.sum b/example/go.sum index c93b507b..4761146d 100644 --- a/example/go.sum +++ b/example/go.sum @@ -1,7 +1,7 @@ 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-20191014143932-b30bf3cef8b1 h1:BhetOsT5IaDOb5cLxWNRBhUToU8C1/WI2nb5sTYKDQE= -gioui.org v0.0.0-20191014143932-b30bf3cef8b1/go.mod h1:KqFFi2Dq5gYA3FJ0sDOt8OBXoMsuxMtE8v2f0JExXAY= +gioui.org v0.0.0-20191014161730-8da2c9dbb4c4 h1:qPPb0TIQ5hVjk7XOg/E7nZL2ImiOgWAmWH9kATsaN3w= +gioui.org v0.0.0-20191014161730-8da2c9dbb4c4/go.mod h1:KqFFi2Dq5gYA3FJ0sDOt8OBXoMsuxMtE8v2f0JExXAY= github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo= github.com/go-gl/glfw v0.0.0-20190409004039-e6da0acd62b1/go.mod h1:vR7hzQXu2zJy9AVAgeJqvqgH9Q5CA+iKCZ2gyEVpxRU= github.com/golang/protobuf v1.2.0 h1:P3YflyNX/ehuJFLhxviNdFxQPkGK5cDcApsge1SqnvM= diff --git a/example/gophers/main.go b/example/gophers/main.go index 3c5c0b47..bdf18679 100644 --- a/example/gophers/main.go +++ b/example/gophers/main.go @@ -25,6 +25,7 @@ import ( "gioui.org/io/key" "gioui.org/io/system" "gioui.org/layout" + "gioui.org/op/paint" "gioui.org/unit" "github.com/google/go-github/v24/github" @@ -191,7 +192,9 @@ func (a *App) fetchContributors() { }() go func() { a, err := fetchImage(avatar) - u.avatar = a + if a != nil { + u.avatar = paint.NewImageOp(a) + } userErrs <- err }() } @@ -205,7 +208,7 @@ func (a *App) fetchContributors() { } // Drop users with no avatar or name. for i := len(users) - 1; i >= 0; i-- { - if u := users[i]; u.name == "" || u.avatar == nil { + if u := users[i]; u.name == "" || u.avatar.Size() == (image.Point{}) { users = append(users[:i], users[i+1:]...) } } diff --git a/example/gophers/ui.go b/example/gophers/ui.go index 1d3166c8..b13928fc 100644 --- a/example/gophers/ui.go +++ b/example/gophers/ui.go @@ -61,7 +61,7 @@ type user struct { name string login string company string - avatar image.Image + avatar paint.ImageOp } var theme *material.Theme