From 1762e0c07b1d24686bb1cec9024c0ed5abc0c3cb Mon Sep 17 00:00:00 2001 From: Elias Naur Date: Mon, 2 Dec 2019 13:20:20 +0100 Subject: [PATCH] cmd,example: update gio version Signed-off-by: Elias Naur --- cmd/go.mod | 2 +- cmd/go.sum | 4 ++-- cmd/gogio/testdata/red.go | 4 +--- example/go.mod | 2 +- example/go.sum | 4 ++-- example/gophers/main.go | 4 +--- example/gophers/main_test.go | 26 ++------------------------ example/hello/hello.go | 4 +--- example/kitchen/kitchen.go | 4 +--- 9 files changed, 12 insertions(+), 42 deletions(-) diff --git a/cmd/go.mod b/cmd/go.mod index eec80c27..ac09eebf 100644 --- a/cmd/go.mod +++ b/cmd/go.mod @@ -3,7 +3,7 @@ module gioui.org/cmd go 1.13 require ( - gioui.org v0.0.0-20191120191531-f3f079df324f + gioui.org v0.0.0-20191202121315-11506a974e90 github.com/chromedp/cdproto v0.0.0-20191114225735-6626966fbae4 github.com/chromedp/chromedp v0.5.2 golang.org/x/image v0.0.0-20190802002840-cff245a6509b diff --git a/cmd/go.sum b/cmd/go.sum index f19773dd..4b9b6c53 100644 --- a/cmd/go.sum +++ b/cmd/go.sum @@ -1,6 +1,6 @@ dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU= -gioui.org v0.0.0-20191120191531-f3f079df324f h1:r8A2iPgz4OoRq4l/NytZznN/NuMamZCAd15oiS2rtoM= -gioui.org v0.0.0-20191120191531-f3f079df324f/go.mod h1:KqFFi2Dq5gYA3FJ0sDOt8OBXoMsuxMtE8v2f0JExXAY= +gioui.org v0.0.0-20191202121315-11506a974e90 h1:+S/bkhXOSFVrqiCmepTFQ7h2ooD8unj+iX1yZfEOGX4= +gioui.org v0.0.0-20191202121315-11506a974e90/go.mod h1:KqFFi2Dq5gYA3FJ0sDOt8OBXoMsuxMtE8v2f0JExXAY= github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802 h1:1BDTz0u9nC3//pOCMdNH+CiXJVYJh5UQNCOBG7jbELc= github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo= github.com/chromedp/cdproto v0.0.0-20191114225735-6626966fbae4 h1:QD3KxSJ59L2lxG6MXBjNHxiQO2RmxTQ3XcK+wO44WOg= diff --git a/cmd/gogio/testdata/red.go b/cmd/gogio/testdata/red.go index f6730ca1..e3df965c 100644 --- a/cmd/gogio/testdata/red.go +++ b/cmd/gogio/testdata/red.go @@ -53,9 +53,7 @@ func loop(w *app.Window) error { color: color.RGBA{R: 0x00, G: 0x00, B: 0x00, A: 0x80}, } - gtx := &layout.Context{ - Queue: w.Queue(), - } + gtx := layout.NewContext(w.Queue()) for { e := <-w.Events() switch e := e.(type) { diff --git a/example/go.mod b/example/go.mod index ba869635..0450a246 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-20191120191531-f3f079df324f + gioui.org v0.0.0-20191202121315-11506a974e90 github.com/google/go-github/v24 v24.0.1 golang.org/x/exp v0.0.0-20191002040644-a1355ae1e2c3 golang.org/x/image v0.0.0-20190802002840-cff245a6509b diff --git a/example/go.sum b/example/go.sum index 714d6515..9bb37a29 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-20191120191531-f3f079df324f h1:r8A2iPgz4OoRq4l/NytZznN/NuMamZCAd15oiS2rtoM= -gioui.org v0.0.0-20191120191531-f3f079df324f/go.mod h1:KqFFi2Dq5gYA3FJ0sDOt8OBXoMsuxMtE8v2f0JExXAY= +gioui.org v0.0.0-20191202121315-11506a974e90 h1:+S/bkhXOSFVrqiCmepTFQ7h2ooD8unj+iX1yZfEOGX4= +gioui.org v0.0.0-20191202121315-11506a974e90/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 8c382dd0..26087cd4 100644 --- a/example/gophers/main.go +++ b/example/gophers/main.go @@ -77,9 +77,7 @@ func initProfiling() { func (a *App) run() error { a.ui.profiling = *stats - gtx := &layout.Context{ - Queue: a.w.Queue(), - } + gtx := layout.NewContext(a.w.Queue()) for { select { case users := <-a.updateUsers: diff --git a/example/gophers/main_test.go b/example/gophers/main_test.go index 7503436a..d998b95c 100644 --- a/example/gophers/main_test.go +++ b/example/gophers/main_test.go @@ -5,38 +5,16 @@ package main import ( "image" "testing" - "time" - "gioui.org/io/event" "gioui.org/layout" - "gioui.org/unit" ) -type queue struct{} - -type config struct{} - func BenchmarkUI(b *testing.B) { fetch := func(_ string) {} u := newUI(fetch) - cfg := new(config) - gtx := &layout.Context{ - Queue: new(queue), - } + gtx := new(layout.Context) for i := 0; i < b.N; i++ { - gtx.Reset(cfg, image.Point{800, 600}) + gtx.Reset(nil, image.Point{800, 600}) u.Layout(gtx) } } - -func (queue) Events(k event.Key) []event.Event { - return nil -} - -func (config) Now() time.Time { - return time.Now() -} - -func (config) Px(v unit.Value) int { - return int(v.V + .5) -} diff --git a/example/hello/hello.go b/example/hello/hello.go index 0bc18463..d2c27f8c 100644 --- a/example/hello/hello.go +++ b/example/hello/hello.go @@ -30,9 +30,7 @@ func main() { func loop(w *app.Window) error { gofont.Register() th := material.NewTheme() - gtx := &layout.Context{ - Queue: w.Queue(), - } + gtx := layout.NewContext(w.Queue()) for { e := <-w.Events() switch e := e.(type) { diff --git a/example/kitchen/kitchen.go b/example/kitchen/kitchen.go index 486924eb..5adaf92e 100644 --- a/example/kitchen/kitchen.go +++ b/example/kitchen/kitchen.go @@ -40,9 +40,7 @@ func main() { func loop(w *app.Window) error { th := material.NewTheme() - gtx := &layout.Context{ - Queue: w.Queue(), - } + gtx := layout.NewContext(w.Queue()) for { e := <-w.Events() switch e := e.(type) {