From 81a84d874b5ab98578df31e6789bf84ee1e0e2e7 Mon Sep 17 00:00:00 2001 From: Elias Naur Date: Tue, 9 Jun 2020 23:03:36 +0200 Subject: [PATCH] example,cmd: bump gio version Signed-off-by: Elias Naur --- cmd/go.mod | 2 +- cmd/go.sum | 4 ++-- cmd/gogio/testdata/red.go | 2 +- example/glfw/main.go | 8 +++++++- example/go.mod | 2 +- example/go.sum | 4 ++-- example/gophers/main.go | 2 +- example/hello/hello.go | 2 +- example/kitchen/kitchen.go | 2 +- example/tabs/tabs.go | 2 +- example/windows/windows.go | 2 +- 11 files changed, 19 insertions(+), 13 deletions(-) diff --git a/cmd/go.mod b/cmd/go.mod index 808f07a8..f5ecfa56 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-20200609202943-a24a2c9fb6a5 + gioui.org v0.0.0-20200609205719-d1ea9339d5a3 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 b9e02a71..11f2612a 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-20200609202943-a24a2c9fb6a5 h1:+TQcTYc42g7IkeCH5uyzmxK/fhZws2qjKvzwIE6Rfxg= -gioui.org v0.0.0-20200609202943-a24a2c9fb6a5/go.mod h1:AHI9rFr6AEEHCb8EPVtb/p5M+NMJRKH58IOp8O3Je04= +gioui.org v0.0.0-20200609205719-d1ea9339d5a3 h1:OtHUEpG7mEh9LLhlkVlsREK8FLu0K5W5ElosuXKHptg= +gioui.org v0.0.0-20200609205719-d1ea9339d5a3/go.mod h1:AHI9rFr6AEEHCb8EPVtb/p5M+NMJRKH58IOp8O3Je04= 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 3324d1b3..73ff972b 100644 --- a/cmd/gogio/testdata/red.go +++ b/cmd/gogio/testdata/red.go @@ -66,7 +66,7 @@ func loop(w *app.Window) error { case system.DestroyEvent: return e.Err case system.FrameEvent: - gtx := layout.NewContext(&ops, e.Queue, e.Config, e.Size) + gtx := layout.NewContext(&ops, e) layout.Flex{Axis: layout.Vertical}.Layout(gtx, layout.Flexed(0.5, func(gtx C) D { return layout.Flex{Axis: layout.Horizontal}.Layout(gtx, diff --git a/example/glfw/main.go b/example/glfw/main.go index 9a75fa81..eca89ab1 100644 --- a/example/glfw/main.go +++ b/example/glfw/main.go @@ -92,7 +92,13 @@ func main() { } width, height := window.GetSize() sz := image.Point{X: width, Y: height} - gtx := layout.NewContext(&ops, &queue, &glfwConfig{scale}, sz) + ops.Reset() + gtx := layout.Context{ + Ops: &ops, + Queue: &queue, + Config: &glfwConfig{scale}, + Constraints: layout.Exact(sz), + } draw(gtx, th) gpu.Collect(sz, gtx.Ops) gpu.BeginFrame() diff --git a/example/go.mod b/example/go.mod index d4044264..046ddcaf 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-20200609202943-a24a2c9fb6a5 + gioui.org v0.0.0-20200609205719-d1ea9339d5a3 github.com/go-gl/gl v0.0.0-20190320180904-bf2b1f2f34d7 github.com/go-gl/glfw/v3.3/glfw v0.0.0-20191125211704-12ad95a8df72 github.com/google/go-github/v24 v24.0.1 diff --git a/example/go.sum b/example/go.sum index c863935a..c58e3cfd 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-20200609202943-a24a2c9fb6a5 h1:+TQcTYc42g7IkeCH5uyzmxK/fhZws2qjKvzwIE6Rfxg= -gioui.org v0.0.0-20200609202943-a24a2c9fb6a5/go.mod h1:AHI9rFr6AEEHCb8EPVtb/p5M+NMJRKH58IOp8O3Je04= +gioui.org v0.0.0-20200609205719-d1ea9339d5a3 h1:OtHUEpG7mEh9LLhlkVlsREK8FLu0K5W5ElosuXKHptg= +gioui.org v0.0.0-20200609205719-d1ea9339d5a3/go.mod h1:AHI9rFr6AEEHCb8EPVtb/p5M+NMJRKH58IOp8O3Je04= github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo= github.com/go-gl/gl v0.0.0-20190320180904-bf2b1f2f34d7 h1:SCYMcCJ89LjRGwEa0tRluNRiMjZHalQZrVrvTbPh+qw= github.com/go-gl/gl v0.0.0-20190320180904-bf2b1f2f34d7/go.mod h1:482civXOzJJCPzJ4ZOX/pwvXBWSnzD4OKMdH4ClKGbk= diff --git a/example/gophers/main.go b/example/gophers/main.go index af916f65..8d1c5729 100644 --- a/example/gophers/main.go +++ b/example/gophers/main.go @@ -126,7 +126,7 @@ func (a *App) run() error { } } case system.FrameEvent: - gtx := layout.NewContext(&ops, e.Queue, e.Config, e.Size) + gtx := layout.NewContext(&ops, e) a.ui.Layout(gtx) e.Frame(gtx.Ops) } diff --git a/example/hello/hello.go b/example/hello/hello.go index 39166dfa..5df6ff79 100644 --- a/example/hello/hello.go +++ b/example/hello/hello.go @@ -37,7 +37,7 @@ func loop(w *app.Window) error { case system.DestroyEvent: return e.Err case system.FrameEvent: - gtx := layout.NewContext(&ops, e.Queue, e.Config, e.Size) + gtx := layout.NewContext(&ops, e) l := material.H1(th, "Hello, Gio") maroon := color.RGBA{127, 0, 0, 255} l.Color = maroon diff --git a/example/kitchen/kitchen.go b/example/kitchen/kitchen.go index 82906822..1cffbd0a 100644 --- a/example/kitchen/kitchen.go +++ b/example/kitchen/kitchen.go @@ -116,7 +116,7 @@ func loop(w *app.Window) error { case system.DestroyEvent: return e.Err case system.FrameEvent: - gtx := layout.NewContext(&ops, e.Queue, e.Config, e.Size) + gtx := layout.NewContext(&ops, e) for iconButton.Clicked() { w.WriteClipboard(lineEditor.Text()) } diff --git a/example/tabs/tabs.go b/example/tabs/tabs.go index d1868083..e9f79f05 100644 --- a/example/tabs/tabs.go +++ b/example/tabs/tabs.go @@ -41,7 +41,7 @@ func loop(w *app.Window) error { case system.DestroyEvent: return e.Err case system.FrameEvent: - gtx := layout.NewContext(&ops, e.Queue, e.Config, e.Size) + gtx := layout.NewContext(&ops, e) drawTabs(gtx, th) e.Frame(gtx.Ops) } diff --git a/example/windows/windows.go b/example/windows/windows.go index 9a8fefc3..0a1f7510 100644 --- a/example/windows/windows.go +++ b/example/windows/windows.go @@ -49,7 +49,7 @@ func (w *window) loop(events <-chan event.Event) error { for w.btn.Clicked() { newWindow() } - gtx := layout.NewContext(&ops, e.Queue, e.Config, e.Size) + gtx := layout.NewContext(&ops, e) layout.Center.Layout(gtx, func(gtx layout.Context) layout.Dimensions { return material.Button(th, &w.btn, "More!").Layout(gtx) })