Skip to content

Commit

Permalink
update gio version
Browse files Browse the repository at this point in the history
  • Loading branch information
eliasnaur committed Oct 2, 2019
1 parent 9e7d689 commit 32a7db6
Show file tree
Hide file tree
Showing 10 changed files with 12 additions and 15 deletions.
2 changes: 1 addition & 1 deletion centering.go
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ func main() {
}
for e := range w.Events() {
if e, ok := e.(app.UpdateEvent); ok {
gtx.Reset(&e.Config, layout.RigidConstraints(e.Size))
gtx.Reset(&e.Config, e.Size)
faces.Reset(gtx.Config)
f := faces.For(regular, unit.Sp(72))
drawLabels(gtx, f)
Expand Down
4 changes: 2 additions & 2 deletions editor.go
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@ func main() {
// END INIT OMIT
for e := range w.Events() {
if e, ok := e.(app.UpdateEvent); ok {
gtx.Reset(&e.Config, layout.RigidConstraints(e.Size)) // HLdraw
faces.Reset(gtx.Config) // HLdraw
gtx.Reset(&e.Config, e.Size) // HLdraw
faces.Reset(gtx.Config) // HLdraw
// START OMIT
editor.Layout(gtx)
// END OMIT
Expand Down
2 changes: 1 addition & 1 deletion flex.go
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ func main() {
}
for e := range w.Events() {
if e, ok := e.(app.UpdateEvent); ok {
gtx.Reset(&e.Config, layout.RigidConstraints(e.Size))
gtx.Reset(&e.Config, e.Size)
drawRects(gtx)
w.Update(gtx.Ops)
}
Expand Down
3 changes: 1 addition & 2 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ module gophercon2019
go 1.13

require (
gioui.org v0.0.0-20190930150022-6bc5ff247938
gioui.org/ui v0.0.0-20190926171558-ce74bc0cbaea
gioui.org v0.0.0-20191002133636-1673600ac641
golang.org/x/image v0.0.0-20190703141733-d6a02ce849c9
)
6 changes: 2 additions & 4 deletions go.sum
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
gioui.org v0.0.0-20190930150022-6bc5ff247938 h1:V13kL8G+RP2/Bj8VF/asHQuIjBBbyqDDGxzbBIisM6g=
gioui.org v0.0.0-20190930150022-6bc5ff247938/go.mod h1:+CEjc9B//HrBfWsQOVxjCyih7HGIj3Pww1xFHVDZyyk=
gioui.org/ui v0.0.0-20190926171558-ce74bc0cbaea h1:rv21Wx1Inf27NY453rrrP6tuEG65PyWPhnP2Jx+Qb8k=
gioui.org/ui v0.0.0-20190926171558-ce74bc0cbaea/go.mod h1:PssKPKlqVIeyaed+0w492Xc2NgX5M3n6oZKOAj5rxoE=
gioui.org v0.0.0-20191002133636-1673600ac641 h1:1TfAleo/D52z+X/VfcZ0jtVQIg8GbW28JFv7ohDkNS4=
gioui.org v0.0.0-20191002133636-1673600ac641/go.mod h1:+CEjc9B//HrBfWsQOVxjCyih7HGIj3Pww1xFHVDZyyk=
golang.org/x/image v0.0.0-20190703141733-d6a02ce849c9 h1:uc17S921SPw5F2gJo7slQ3aqvr2RwpL7eb3+DZncu3s=
golang.org/x/image v0.0.0-20190703141733-d6a02ce849c9/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0=
golang.org/x/sys v0.0.0-20190813064441-fde4db37ae7a h1:aYOabOQFp6Vj6W1F80affTUvO9UxmJRx8K0gsfABByQ=
Expand Down
2 changes: 1 addition & 1 deletion helloworld.go
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ func main() {
}
for e := range w.Events() {
if e, ok := e.(app.UpdateEvent); ok {
gtx.Reset(&e.Config, layout.RigidConstraints(e.Size))
gtx.Reset(&e.Config, e.Size)
faces.Reset(gtx.Config)

lbl := text.Label{Face: faces.For(regular, unit.Sp(72)), Text: "Hello, World!"} // HLdraw
Expand Down
2 changes: 1 addition & 1 deletion list.go
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ func main() {
// END INIT OMIT
for e := range w.Events() {
if e, ok := e.(app.UpdateEvent); ok {
gtx.Reset(&e.Config, layout.RigidConstraints(e.Size))
gtx.Reset(&e.Config, e.Size)
faces.Reset(gtx.Config)
f := faces.For(regular, unit.Sp(42))
drawList(gtx, list, f)
Expand Down
2 changes: 1 addition & 1 deletion stack.go
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ func main() {
}
for e := range w.Events() {
if e, ok := e.(app.UpdateEvent); ok {
gtx.Reset(&e.Config, layout.RigidConstraints(e.Size))
gtx.Reset(&e.Config, e.Size)
drawRects(gtx)
w.Update(gtx.Ops)
}
Expand Down
2 changes: 1 addition & 1 deletion twolabels1.go
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ func main() {
// START OMIT
for e := range w.Events() {
if e, ok := e.(app.UpdateEvent); ok {
gtx.Reset(&e.Config, layout.RigidConstraints(e.Size))
gtx.Reset(&e.Config, e.Size)
faces.Reset(gtx.Config)
f := faces.For(regular, unit.Sp(122))
drawLabels(gtx, f) // HLdraw
Expand Down
2 changes: 1 addition & 1 deletion twolabels2.go
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ func main() {
// START OMIT
for e := range w.Events() {
if e, ok := e.(app.UpdateEvent); ok {
gtx.Reset(&e.Config, layout.RigidConstraints(e.Size))
gtx.Reset(&e.Config, e.Size)
faces.Reset(gtx.Config)
f := faces.For(regular, unit.Sp(122))
drawLabels(gtx, f) // HLdraw
Expand Down

0 comments on commit 32a7db6

Please sign in to comment.