cmd,example: update gio version

Signed-off-by: Elias Naur <mail@eliasnaur.com>
This commit is contained in:
Elias Naur
2019-12-11 23:57:25 +01:00
parent 7814da47a0
commit 0bfcac9734
7 changed files with 163 additions and 168 deletions
+1 -1
View File
@@ -3,7 +3,7 @@ module gioui.org/cmd
go 1.13
require (
gioui.org v0.0.0-20191203232943-86d69859b93a
gioui.org v0.0.0-20191211234536-7814da47a0ff
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
+2 -2
View File
@@ -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-20191203232943-86d69859b93a h1:bF+1UDLyzDS3uePt+vWdPres0WauMc6cjvTOAYuPRU8=
gioui.org v0.0.0-20191203232943-86d69859b93a/go.mod h1:KqFFi2Dq5gYA3FJ0sDOt8OBXoMsuxMtE8v2f0JExXAY=
gioui.org v0.0.0-20191211234536-7814da47a0ff h1:XaABsWEirzZKjqiWVD5eck5Ge/FpYEP9/eZHV1jpj50=
gioui.org v0.0.0-20191211234536-7814da47a0ff/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=
+18 -14
View File
@@ -62,20 +62,24 @@ func loop(w *app.Window) error {
case system.FrameEvent:
gtx.Reset(e.Config, e.Size)
rows := layout.Flex{Axis: layout.Vertical}
r1 := rows.Flex(gtx, 0.5, func() {
columns := layout.Flex{Axis: layout.Horizontal}
r1c1 := columns.Flex(gtx, 0.5, func() { topLeft.Layout(gtx) })
r1c2 := columns.Flex(gtx, 0.5, func() { topRight.Layout(gtx) })
columns.Layout(gtx, r1c1, r1c2)
})
r2 := rows.Flex(gtx, 0.5, func() {
columns := layout.Flex{Axis: layout.Horizontal}
r2c1 := columns.Flex(gtx, 0.5, func() { botLeft.Layout(gtx) })
r2c2 := columns.Flex(gtx, 0.5, func() { botRight.Layout(gtx) })
columns.Layout(gtx, r2c1, r2c2)
})
rows.Layout(gtx, r1, r2)
layout.Flex{Axis: layout.Vertical}.Layout(gtx,
layout.Flexed(0.5, func() {
layout.Flex{Axis: layout.Horizontal}.Layout(gtx,
// r1c1
layout.Flexed(0.5, func() { topLeft.Layout(gtx) }),
// r1c2
layout.Flexed(0.5, func() { topRight.Layout(gtx) }),
)
}),
layout.Flexed(0.5, func() {
layout.Flex{Axis: layout.Horizontal}.Layout(gtx,
// r2c1
layout.Flexed(0.5, func() { botLeft.Layout(gtx) }),
// r2c2
layout.Flexed(0.5, func() { botRight.Layout(gtx) }),
)
}),
)
e.Frame(gtx.Ops)