update examples to use new Env interface

5 files changed, 13 insertions, 9 deletions

diff --git a/examples/imageviewer/browser.go b/examples/imageviewer/browser.go
index cdac56f..6716918 100644
--- a/examples/imageviewer/browser.go
+++ b/examples/imageviewer/browser.go
@@ -108,7 +108,7 @@ func Browser(env gui.Env, theme *Theme, dir string, cd <-chan string, view chan<
 
 		case e, ok := <-env.Events():
 			if !ok {
-				close(env.Draw())
+				env.Close()
 				return
 			}
 
diff --git a/examples/imageviewer/button.go b/examples/imageviewer/button.go
index 0693e06..4e00287 100644
--- a/examples/imageviewer/button.go
+++ b/examples/imageviewer/button.go
@@ -58,5 +58,5 @@ func Button(env gui.Env, theme *Theme, text string, action func()) {
 		}
 	}
 
-	close(env.Draw())
+	env.Close()
 }
diff --git a/examples/imageviewer/main.go b/examples/imageviewer/main.go
index 67f97fb..10335a1 100644
--- a/examples/imageviewer/main.go
+++ b/examples/imageviewer/main.go
@@ -56,7 +56,7 @@ func run() {
 	for e := range env.Events() {
 		switch e.(type) {
 		case win.WiClose:
-			close(env.Draw())
+			env.Close()
 		}
 	}
 }
diff --git a/examples/imageviewer/splits.go b/examples/imageviewer/splits.go
index f9daf2e..93a91be 100644
--- a/examples/imageviewer/splits.go
+++ b/examples/imageviewer/splits.go
@@ -8,12 +8,16 @@ import (
 )
 
 type envPair struct {
+	env    gui.Env
 	events <-chan gui.Event
 	draw   chan<- func(draw.Image) image.Rectangle
+	impose chan<- gui.Constraint
 }
 
 func (ep *envPair) Events() <-chan gui.Event                      { return ep.events }
 func (ep *envPair) Draw() chan<- func(draw.Image) image.Rectangle { return ep.draw }
+func (ep *envPair) Impose() chan<- gui.Constraint                 { return ep.impose }
+func (ep *envPair) Close()                                        { ep.env.Close() }
 
 func FixedLeft(env gui.Env, maxX int) gui.Env {
 	out, in := gui.MakeEventsChan()
@@ -30,7 +34,7 @@ func FixedLeft(env gui.Env, maxX int) gui.Env {
 		close(in)
 	}()
 
-	return &envPair{out, env.Draw()}
+	return &envPair{env, out, env.Draw(), env.Impose()}
 }
 
 func FixedRight(env gui.Env, minX int) gui.Env {
@@ -48,7 +52,7 @@ func FixedRight(env gui.Env, minX int) gui.Env {
 		close(in)
 	}()
 
-	return &envPair{out, env.Draw()}
+	return &envPair{env, out, env.Draw(), env.Impose()}
 }
 
 func FixedTop(env gui.Env, maxY int) gui.Env {
@@ -66,7 +70,7 @@ func FixedTop(env gui.Env, maxY int) gui.Env {
 		close(in)
 	}()
 
-	return &envPair{out, env.Draw()}
+	return &envPair{env, out, env.Draw(), env.Impose()}
 }
 
 func FixedBottom(env gui.Env, minY int) gui.Env {
@@ -84,7 +88,7 @@ func FixedBottom(env gui.Env, minY int) gui.Env {
 		close(in)
 	}()
 
-	return &envPair{out, env.Draw()}
+	return &envPair{env, out, env.Draw(), env.Impose()}
 }
 
 func EvenHorizontal(env gui.Env, minI, maxI, n int) gui.Env {
@@ -103,5 +107,5 @@ func EvenHorizontal(env gui.Env, minI, maxI, n int) gui.Env {
 		close(in)
 	}()
 
-	return &envPair{out, env.Draw()}
+	return &envPair{env, out, env.Draw(), env.Impose()}
 }
diff --git a/examples/imageviewer/viewer.go b/examples/imageviewer/viewer.go
index 6f68e15..35e4081 100644
--- a/examples/imageviewer/viewer.go
+++ b/examples/imageviewer/viewer.go
@@ -50,7 +50,7 @@ func Viewer(env gui.Env, theme *Theme, view <-chan string) {
 
 		case e, ok := <-env.Events():
 			if !ok {
-				close(env.Draw())
+				env.Close()
 				return
 			}
 			if resize, ok := e.(gui.Resize); ok {