update to renamed gioui.org module

eliasnaur · Sep 30, 2019 · 8cf8479 · 8cf8479
1 parent a8632c4
commit 8cf8479
Show file tree

Hide file tree

Showing 15 changed files with 59 additions and 59 deletions.
diff --git a/animatedclipping.go b/animatedclipping.go
@@ -6,9 +6,9 @@ import (
 	"time"
 
 	"gioui.org/ui"
-	"gioui.org/ui/app"
-	"gioui.org/ui/f32"
-	"gioui.org/ui/paint"
+	"gioui.org/app"
+	"gioui.org/f32"
+	"gioui.org/paint"
 )
 
 func main() {

diff --git a/animatedcolor.go b/animatedcolor.go
@@ -6,9 +6,9 @@ import (
 	"time"
 
 	"gioui.org/ui"
-	"gioui.org/ui/app"
-	"gioui.org/ui/f32"
-	"gioui.org/ui/paint"
+	"gioui.org/app"
+	"gioui.org/f32"
+	"gioui.org/paint"
 )
 
 func main() {

diff --git a/blank.go b/blank.go
@@ -1,7 +1,7 @@
 package main
 
 import (
-	"gioui.org/ui/app"
+	"gioui.org/app"
 )
 
 func main() {

diff --git a/centering.go b/centering.go
@@ -2,11 +2,11 @@ package main
 
 import (
 	"gioui.org/ui"
-	"gioui.org/ui/app"
-	"gioui.org/ui/f32"
-	"gioui.org/ui/layout"
-	"gioui.org/ui/measure"
-	"gioui.org/ui/text"
+	"gioui.org/app"
+	"gioui.org/f32"
+	"gioui.org/layout"
+	"gioui.org/measure"
+	"gioui.org/text"
 
 	"golang.org/x/image/font/gofont/goregular"
 	"golang.org/x/image/font/sfnt"

diff --git a/editor.go b/editor.go
@@ -2,10 +2,10 @@ package main
 
 import (
 	"gioui.org/ui"
-	"gioui.org/ui/app"
-	"gioui.org/ui/layout"
-	"gioui.org/ui/measure"
-	"gioui.org/ui/text"
+	"gioui.org/app"
+	"gioui.org/layout"
+	"gioui.org/measure"
+	"gioui.org/text"
 
 	"golang.org/x/image/font/gofont/goregular"
 	"golang.org/x/image/font/sfnt"

diff --git a/flex.go b/flex.go
@@ -4,10 +4,10 @@ import (
 	"image"
 	"image/color"
 
-	"gioui.org/ui/app"
-	"gioui.org/ui/f32"
-	"gioui.org/ui/layout"
-	"gioui.org/ui/paint"
+	"gioui.org/app"
+	"gioui.org/f32"
+	"gioui.org/layout"
+	"gioui.org/paint"
 )
 
 func main() {

diff --git a/go.mod b/go.mod
@@ -3,6 +3,6 @@ module gophercon2019
 go 1.13
 
 require (
-	gioui.org/ui v0.0.0-20190926171558-ce74bc0cbaea
+	gioui.org v0.0.0-20190930110410-3c65aa61f64e
 	golang.org/x/image v0.0.0-20190703141733-d6a02ce849c9
 )
diff --git a/go.sum b/go.sum
@@ -1,5 +1,5 @@
-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-20190930110410-3c65aa61f64e h1:QD7zkFNJz4TfiOv38QqBHZcR/RCtrQxJ4toj4DQYSV0=
+gioui.org v0.0.0-20190930110410-3c65aa61f64e/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=

diff --git a/gophercon-2019.slide b/gophercon-2019.slide
@@ -148,7 +148,7 @@ Enable modules
 
 Build, install or run the program
 
-	go build gioui.org/ui/apps/hello
+	go build gioui.org/apps/hello
 	go install scatter.im/cmd/scatter
 	go run helloworld.go
 
@@ -241,7 +241,7 @@ Serializing operations
 
 Only the app package depends on platform libraries
 
-	import "gioui.org/ui/app"
+	import "gioui.org/app"
 
 	var w app.Window
 	w.Update(&ops)
@@ -276,7 +276,7 @@ Request a redraw
 
 Set current color or image
 
-	import "gioui.org/ui/draw"
+	import "gioui.org/paint"
 
 	paint.ColorOp{Color: color.RGBA{...}}.Add(ops)
 	paint.ImageOp{Src: ..., Rect: ...}.Add(ops)
@@ -312,7 +312,7 @@ Or to an outline
 
 Keyboard and text input
 
-	import "gioui.org/ui/key"
+	import "gioui.org/key"
 
 	// Declare key handler.
 	key.InputOp{Key: handler, Focus: true/false}.Add(ops)
@@ -322,7 +322,7 @@ Keyboard and text input
 
 Mouse and touch input
 
-	import "gioui.org/ui/pointer"
+	import "gioui.org/pointer"
 
 	// Define hit area.
 	pointer.RectAreaOp{Size: ...}.Add(ops)
@@ -361,7 +361,7 @@ Drawing and animating a clipped square
 
 Constraints are input
 
-	package layout // import gioui.org/ui/layout
+	package layout // import gioui.org/layout
 
 	type Constraints struct {
 		Width  Constraint
@@ -384,12 +384,12 @@ Dimensions are output
 Widgets accept constraints, output dimensions, stored in
 layout.Context.
 
-	package text // import gioui.org/ui/text
+	package text // import gioui.org/text
 
 	func (l Label) Layout(gtx *layout.Context)
 	func (e *Editor) Layout(gtx *layout.Context)
 
-	package widget // import gioui.org/ui/widget
+	package widget // import gioui.org/widget
 
 	func (im Image) Layout(gtx *layout.Context)
 
@@ -552,7 +552,7 @@ Lay out widgets on an axis.
 
 The Window's Queue method returns an ui.Queue for OS events.
 
-	package app // import gioui.org/ui/app
+	package app // import gioui.org/app
 
 	func (w *Window) Queue() *Queue
 
@@ -561,7 +561,7 @@ The Window's Queue method returns an ui.Queue for OS events.
 * Gestures
 
 	import "gioui.org/ui"
-	import "gioui.org/ui/gesture"
+	import "gioui.org/gesture"
 
 Detect clicks
 
@@ -591,7 +591,7 @@ Determine scroll distance from mouse wheel or touch drag/fling
 
 Initialize the editor
 
-	import "gioui.org/ui/text"
+	import "gioui.org/text"
 
 .code editor.go /START INIT OMIT/,/END INIT OMIT/
 

diff --git a/helloworld.go b/helloworld.go
@@ -2,10 +2,10 @@ package main
 
 import (
 	"gioui.org/ui"
-	"gioui.org/ui/app"
-	"gioui.org/ui/layout"
-	"gioui.org/ui/measure"
-	"gioui.org/ui/text"
+	"gioui.org/app"
+	"gioui.org/layout"
+	"gioui.org/measure"
+	"gioui.org/text"
 
 	"golang.org/x/image/font/gofont/goregular"
 	"golang.org/x/image/font/sfnt"

diff --git a/list.go b/list.go
@@ -4,10 +4,10 @@ import (
 	"fmt"
 
 	"gioui.org/ui"
-	"gioui.org/ui/app"
-	"gioui.org/ui/layout"
-	"gioui.org/ui/measure"
-	"gioui.org/ui/text"
+	"gioui.org/app"
+	"gioui.org/layout"
+	"gioui.org/measure"
+	"gioui.org/text"
 
 	"golang.org/x/image/font/gofont/goregular"
 	"golang.org/x/image/font/sfnt"

diff --git a/pointer.go b/pointer.go
@@ -5,10 +5,10 @@ import (
 	"image/color"
 
 	"gioui.org/ui"
-	"gioui.org/ui/app"
-	"gioui.org/ui/f32"
-	"gioui.org/ui/paint"
-	"gioui.org/ui/pointer"
+	"gioui.org/app"
+	"gioui.org/f32"
+	"gioui.org/paint"
+	"gioui.org/pointer"
 )
 
 // START QUEUE OMIT

diff --git a/stack.go b/stack.go
@@ -5,10 +5,10 @@ import (
 	"image/color"
 
 	"gioui.org/ui"
-	"gioui.org/ui/app"
-	"gioui.org/ui/f32"
-	"gioui.org/ui/layout"
-	"gioui.org/ui/paint"
+	"gioui.org/app"
+	"gioui.org/f32"
+	"gioui.org/layout"
+	"gioui.org/paint"
 )
 
 func main() {

diff --git a/twolabels1.go b/twolabels1.go
@@ -2,10 +2,10 @@ package main
 
 import (
 	"gioui.org/ui"
-	"gioui.org/ui/app"
-	"gioui.org/ui/layout"
-	"gioui.org/ui/measure"
-	"gioui.org/ui/text"
+	"gioui.org/app"
+	"gioui.org/layout"
+	"gioui.org/measure"
+	"gioui.org/text"
 
 	"golang.org/x/image/font/gofont/goregular"
 	"golang.org/x/image/font/sfnt"

diff --git a/twolabels2.go b/twolabels2.go
@@ -2,11 +2,11 @@ package main
 
 import (
 	"gioui.org/ui"
-	"gioui.org/ui/app"
-	"gioui.org/ui/f32"
-	"gioui.org/ui/layout"
-	"gioui.org/ui/measure"
-	"gioui.org/ui/text"
+	"gioui.org/app"
+	"gioui.org/f32"
+	"gioui.org/layout"
+	"gioui.org/measure"
+	"gioui.org/text"
 
 	"golang.org/x/image/font/gofont/goregular"
 	"golang.org/x/image/font/sfnt"