From 3164a3fee76692f3b85ed4386e222e9f2aa72f9e Mon Sep 17 00:00:00 2001 From: Elias Naur Date: Sun, 24 May 2020 13:24:13 +0200 Subject: [PATCH] example,cmd: bump gio version Signed-off-by: Elias Naur --- cmd/go.mod | 2 +- cmd/go.sum | 4 ++-- example/go.mod | 2 +- example/go.sum | 4 ++-- example/gophers/ui.go | 2 +- example/kitchen/kitchen.go | 18 +++++++++--------- example/tabs/tabs.go | 2 +- 7 files changed, 17 insertions(+), 17 deletions(-) diff --git a/cmd/go.mod b/cmd/go.mod index c583b72e..00e83c7a 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-20200523202849-2451750782b8 + gioui.org v0.0.0-20200524112000-4898e1a6914b 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 71d0e62d..01069336 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-20200523202849-2451750782b8 h1:TB+F3jDAVjNemdtgc8yfvsPy1xWkyn7JLOsm5r+YUuQ= -gioui.org v0.0.0-20200523202849-2451750782b8/go.mod h1:AHI9rFr6AEEHCb8EPVtb/p5M+NMJRKH58IOp8O3Je04= +gioui.org v0.0.0-20200524112000-4898e1a6914b h1:QlWcMLav7UWzEst7829ntKvNwNN1fPXR38BwndoZQxg= +gioui.org v0.0.0-20200524112000-4898e1a6914b/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/example/go.mod b/example/go.mod index a4a42312..8fec44dc 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-20200523202849-2451750782b8 + gioui.org v0.0.0-20200524112000-4898e1a6914b 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 40d3f18a..fa14087e 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-20200523202849-2451750782b8 h1:TB+F3jDAVjNemdtgc8yfvsPy1xWkyn7JLOsm5r+YUuQ= -gioui.org v0.0.0-20200523202849-2451750782b8/go.mod h1:AHI9rFr6AEEHCb8EPVtb/p5M+NMJRKH58IOp8O3Je04= +gioui.org v0.0.0-20200524112000-4898e1a6914b h1:QlWcMLav7UWzEst7829ntKvNwNN1fPXR38BwndoZQxg= +gioui.org v0.0.0-20200524112000-4898e1a6914b/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/ui.go b/example/gophers/ui.go index 60903832..7811d858 100644 --- a/example/gophers/ui.go +++ b/example/gophers/ui.go @@ -242,7 +242,7 @@ func (u *UI) layoutUsers(gtx layout.Context) { layout.Stacked(func(gtx C) D { in := layout.UniformInset(unit.Dp(16)) return in.Layout(gtx, func(gtx C) D { - for u.fab.Clicked(gtx) { + for u.fab.Clicked() { } return material.IconButton(theme, u.fab, u.fabIcon).Layout(gtx) }) diff --git a/example/kitchen/kitchen.go b/example/kitchen/kitchen.go index 1c60f29d..a480920a 100644 --- a/example/kitchen/kitchen.go +++ b/example/kitchen/kitchen.go @@ -118,10 +118,10 @@ func loop(w *app.Window) error { return e.Err case system.FrameEvent: gtx := layout.NewContext(&ops, e.Queue, e.Config, e.Size) - for iconButton.Clicked(gtx) { + for iconButton.Clicked() { w.WriteClipboard(lineEditor.Text()) } - for flatBtn.Clicked(gtx) { + for flatBtn.Clicked() { w.ReadClipboard() } kitchen(gtx, th) @@ -198,6 +198,12 @@ func (b iconAndTextButton) Layout(gtx layout.Context) layout.Dimensions { } func kitchen(gtx layout.Context, th *material.Theme) layout.Dimensions { + for _, e := range lineEditor.Events() { + if e, ok := e.(widget.SubmitEvent); ok { + topLabel = e.Text + lineEditor.SetText("") + } + } widgets := []layout.Widget{ material.H3(th, topLabel).Layout, func(gtx C) D { @@ -205,12 +211,6 @@ func kitchen(gtx layout.Context, th *material.Theme) layout.Dimensions { return material.Editor(th, editor, "Hint").Layout(gtx) }, func(gtx C) D { - for _, e := range lineEditor.Events(gtx) { - if e, ok := e.(widget.SubmitEvent); ok { - topLabel = e.Text - lineEditor.SetText("") - } - } e := material.Editor(th, lineEditor, "Hint") e.Font.Style = text.Italic return e.Layout(gtx) @@ -226,7 +226,7 @@ func kitchen(gtx layout.Context, th *material.Theme) layout.Dimensions { }), layout.Rigid(func(gtx C) D { return in.Layout(gtx, func(gtx C) D { - for button.Clicked(gtx) { + for button.Clicked() { green = !green } return material.Button(th, button, "Click me!").Layout(gtx) diff --git a/example/tabs/tabs.go b/example/tabs/tabs.go index 5c20ddd0..b4c011f3 100644 --- a/example/tabs/tabs.go +++ b/example/tabs/tabs.go @@ -81,7 +81,7 @@ func drawTabs(gtx layout.Context, th *material.Theme) layout.Dimensions { layout.Rigid(func(gtx C) D { return tabs.list.Layout(gtx, len(tabs.tabs), func(gtx C, tabIdx int) D { t := &tabs.tabs[tabIdx] - if t.btn.Clicked(gtx) { + if t.btn.Clicked() { if tabs.selected < tabIdx { slider.PushLeft() } else if tabs.selected > tabIdx {