adapt grid to new layout design

2 files changed, 5 insertions, 7 deletions

diff --git a/layout/grid.go b/grid.go
index 3ff8112..13e986a 100644
--- a/layout/grid.go
+++ b/grid.go
@@ -1,15 +1,13 @@
-package layout
+package gui
 
 import (
 	"image"
 	"image/color"
 	"image/draw"
 	"log"
-
-	"github.com/faiface/gui"
 )
 
-var _ Layout = Grid{}
+var _ Scheme = Grid{}
 
 // Grid represents a grid with rows and columns in each row.
 // Each row can be a different length.
@@ -50,11 +48,11 @@ func (g Grid) redraw(drw draw.Image, bounds image.Rectangle) {
 	draw.Draw(drw, bounds.Inset(g.Border), image.NewUniform(col), image.ZP, draw.Src)
 }
 
-func (g Grid) Intercept(env gui.Env) gui.Env {
+func (g Grid) Intercept(env Env) Env {
 	return RedrawIntercepter{g.redraw}.Intercept(env)
 }
 
-func (g Grid) Lay(bounds image.Rectangle) []image.Rectangle {
+func (g Grid) Partition(bounds image.Rectangle) []image.Rectangle {
 	gap := g.Gap
 	rows := g.Rows
 	splitMain := g.Split
diff --git a/layout/split.go b/split.go
index db04225..ab6789b 100644
--- a/layout/split.go
+++ b/split.go
@@ -1,4 +1,4 @@
-package layout
+package gui
 
 import "fmt"