diff --git a/cmd/go.mod b/cmd/go.mod index 5c43d662..80d13841 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-20191109184219-65c783179dbb + gioui.org v0.0.0-20191118140311-16cc51ee8aa6 github.com/chromedp/cdproto v0.0.0-20191009033829-c22f49c9ff0a github.com/chromedp/chromedp v0.5.1 golang.org/x/image v0.0.0-20190802002840-cff245a6509b diff --git a/cmd/go.sum b/cmd/go.sum index 17bf9a35..1c5a973a 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-20191109184219-65c783179dbb h1:5bQ+OfWFec3Dqgf1wpqtwGQZq/yaVGsgTKM1D4SNIek= -gioui.org v0.0.0-20191109184219-65c783179dbb/go.mod h1:KqFFi2Dq5gYA3FJ0sDOt8OBXoMsuxMtE8v2f0JExXAY= +gioui.org v0.0.0-20191118140311-16cc51ee8aa6 h1:BGCyE3K5szHLZqNXruHBC+z++CHKznJyi8KXdNEc754= +gioui.org v0.0.0-20191118140311-16cc51ee8aa6/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-20191009033829-c22f49c9ff0a h1:AuIGvB6IuWpMEdfKQ+t77D6dzLpNftzxAsktehYyWn8= diff --git a/cmd/gogio/testdata/red.go b/cmd/gogio/testdata/red.go index 9e59e1d0..2964a563 100644 --- a/cmd/gogio/testdata/red.go +++ b/cmd/gogio/testdata/red.go @@ -122,9 +122,9 @@ func (w *quarterWidget) Layout(gtx *layout.Context) { Y: float32(gtx.Constraints.Height.Max), }}}.Add(gtx.Ops) - pointer.RectAreaOp{Rect: image.Rectangle{ + pointer.Rect(image.Rectangle{ Max: image.Pt(gtx.Constraints.Width.Max, gtx.Constraints.Height.Max), - }}.Add(gtx.Ops) + }).Add(gtx.Ops) pointer.InputOp{Key: w}.Add(gtx.Ops) for _, e := range gtx.Events(w) { diff --git a/example/go.mod b/example/go.mod index b504594a..ad144dc4 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-20191118133328-7299d1c875c8 + gioui.org v0.0.0-20191118140311-16cc51ee8aa6 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 3ab84520..7b7b87ba 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-20191118133328-7299d1c875c8 h1:ayM/ptnctACI3lGItHgfNFOoqYzKeIk9vOw6J2J7EhA= -gioui.org v0.0.0-20191118133328-7299d1c875c8/go.mod h1:KqFFi2Dq5gYA3FJ0sDOt8OBXoMsuxMtE8v2f0JExXAY= +gioui.org v0.0.0-20191118140311-16cc51ee8aa6 h1:BGCyE3K5szHLZqNXruHBC+z++CHKznJyi8KXdNEc754= +gioui.org v0.0.0-20191118140311-16cc51ee8aa6/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/ui.go b/example/gophers/ui.go index 2b114530..a54dceb5 100644 --- a/example/gophers/ui.go +++ b/example/gophers/ui.go @@ -310,7 +310,7 @@ func (u *UI) user(gtx *layout.Context, index int) { }) f.Layout(gtx, c1, c2) }) - pointer.RectAreaOp{Rect: image.Rectangle{Max: gtx.Dimensions.Size}}.Add(gtx.Ops) + pointer.Rect(image.Rectangle{Max: gtx.Dimensions.Size}).Add(gtx.Ops) click := &u.userClicks[index] click.Add(gtx.Ops) })