From bb8bb504d82965be7746bcb687a064e13fed3954 Mon Sep 17 00:00:00 2001 From: Elias Naur Date: Wed, 10 Jun 2020 11:29:23 +0200 Subject: [PATCH] cmd,example: bump gio version Signed-off-by: Elias Naur --- cmd/go.mod | 2 +- cmd/go.sum | 4 ++-- cmd/gogio/testdata/red.go | 12 ++++++------ example/go.mod | 2 +- example/go.sum | 4 ++-- 5 files changed, 12 insertions(+), 12 deletions(-) diff --git a/cmd/go.mod b/cmd/go.mod index 09a94bdd..896a83f4 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-20200609212308-6380baacb6c4 + gioui.org v0.0.0-20200610092525-5272dc9fa590 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 b6eff5ac..18b81a42 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-20200609212308-6380baacb6c4 h1:f46RMK4xQe/lY6RKAVb+piVxookdTnb7LTddYsjgGt4= -gioui.org v0.0.0-20200609212308-6380baacb6c4/go.mod h1:AHI9rFr6AEEHCb8EPVtb/p5M+NMJRKH58IOp8O3Je04= +gioui.org v0.0.0-20200610092525-5272dc9fa590 h1:OHAR2uq/2z4tLN+eRTYf/E/YeUN/Hc8YP2FmTkkSIrU= +gioui.org v0.0.0-20200610092525-5272dc9fa590/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 73ff972b..354d02c3 100644 --- a/cmd/gogio/testdata/red.go +++ b/cmd/gogio/testdata/red.go @@ -68,20 +68,20 @@ func loop(w *app.Window) error { case system.FrameEvent: gtx := layout.NewContext(&ops, e) layout.Flex{Axis: layout.Vertical}.Layout(gtx, - layout.Flexed(0.5, func(gtx C) D { + layout.Flexed(1, func(gtx C) D { return layout.Flex{Axis: layout.Horizontal}.Layout(gtx, // r1c1 - layout.Flexed(0.5, func(gtx C) D { return topLeft.Layout(gtx) }), + layout.Flexed(1, func(gtx C) D { return topLeft.Layout(gtx) }), // r1c2 - layout.Flexed(0.5, func(gtx C) D { return topRight.Layout(gtx) }), + layout.Flexed(1, func(gtx C) D { return topRight.Layout(gtx) }), ) }), - layout.Flexed(0.5, func(gtx C) D { + layout.Flexed(1, func(gtx C) D { return layout.Flex{Axis: layout.Horizontal}.Layout(gtx, // r2c1 - layout.Flexed(0.5, func(gtx C) D { return botLeft.Layout(gtx) }), + layout.Flexed(1, func(gtx C) D { return botLeft.Layout(gtx) }), // r2c2 - layout.Flexed(0.5, func(gtx C) D { return botRight.Layout(gtx) }), + layout.Flexed(1, func(gtx C) D { return botRight.Layout(gtx) }), ) }), ) diff --git a/example/go.mod b/example/go.mod index 8c728623..318e77f0 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-20200609212308-6380baacb6c4 + gioui.org v0.0.0-20200610092525-5272dc9fa590 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 cd392287..6b9e3420 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-20200609212308-6380baacb6c4 h1:f46RMK4xQe/lY6RKAVb+piVxookdTnb7LTddYsjgGt4= -gioui.org v0.0.0-20200609212308-6380baacb6c4/go.mod h1:AHI9rFr6AEEHCb8EPVtb/p5M+NMJRKH58IOp8O3Je04= +gioui.org v0.0.0-20200610092525-5272dc9fa590 h1:OHAR2uq/2z4tLN+eRTYf/E/YeUN/Hc8YP2FmTkkSIrU= +gioui.org v0.0.0-20200610092525-5272dc9fa590/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=