From 1415586e633ee33194442f131a5a691f889c8ee5 Mon Sep 17 00:00:00 2001 From: Clement Benard Date: Tue, 9 Jul 2019 15:31:32 +0200 Subject: better Mux and Env handling in layout --- layout/grid.go | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'layout/grid.go') diff --git a/layout/grid.go b/layout/grid.go index 55111cb..1831794 100644 --- a/layout/grid.go +++ b/layout/grid.go @@ -18,7 +18,7 @@ type Grid struct { SplitY func(int, int) []int } -func NewGrid(env gui.Env, contents [][]*gui.Env, options ...func(*Grid)) { +func NewGrid(env gui.Env, contents [][]*gui.Env, options ...func(*Grid)) gui.Env { ret := &Grid{ Background: image.Black, Gap: 0, @@ -30,12 +30,14 @@ func NewGrid(env gui.Env, contents [][]*gui.Env, options ...func(*Grid)) { f(ret) } - mux := NewMux(env, ret) + mux, env := NewMux(env, ret) for _, row := range contents { for _, item := range row { - *item, _ = mux.makeEnv(false) + *item = mux.MakeEnv() } } + + return env } func GridBackground(c color.Color) func(*Grid) { -- cgit v1.2.3