From a109a3641cc59c511c40fe947195a2e77e66d4e3 Mon Sep 17 00:00:00 2001 From: Roi Martin Date: Tue, 18 Oct 2016 00:36:26 +0200 Subject: [PATCH] Use ActiveColor in dynamic.go. Fix bug in active.go --- _examples/active.go | 4 ++-- _examples/dynamic.go | 24 ++---------------------- 2 files changed, 4 insertions(+), 24 deletions(-) diff --git a/_examples/active.go b/_examples/active.go index 40394f3..1cafa12 100644 --- a/_examples/active.go +++ b/_examples/active.go @@ -27,11 +27,11 @@ func nextView(g *gocui.Gui, v *gocui.View) error { nextIndex := (active + 1) % len(viewArr) name := viewArr[nextIndex] - v, err := g.View("v2") + out, err := g.View("v2") if err != nil { return err } - fmt.Fprintln(v, "Going from view "+v.Name()+" to "+name) + fmt.Fprintln(out, "Going from view "+v.Name()+" to "+name) if _, err := setCurrentViewOnTop(g, name); err != nil { return err diff --git a/_examples/dynamic.go b/_examples/dynamic.go index 3c26f95..0e9b69d 100644 --- a/_examples/dynamic.go +++ b/_examples/dynamic.go @@ -28,6 +28,8 @@ func main() { defer g.Close() g.SetLayout(layout) + g.ActiveColor = gocui.ColorRed + if err := initKeybindings(g); err != nil { log.Panicln(err) } @@ -128,15 +130,6 @@ func newView(g *gocui.Gui) error { if _, err := g.SetCurrentView(name); err != nil { return err } - v.BgColor = gocui.ColorRed - - if curView >= 0 { - cv, err := g.View(views[curView]) - if err != nil { - return err - } - cv.BgColor = g.BgColor - } views = append(views, name) curView = len(views) - 1 @@ -163,22 +156,9 @@ func nextView(g *gocui.Gui, disableCurrent bool) error { next = 0 } - nv, err := g.View(views[next]) - if err != nil { - return err - } if _, err := g.SetCurrentView(views[next]); err != nil { return err } - nv.BgColor = gocui.ColorRed - - if disableCurrent && len(views) > 1 { - cv, err := g.View(views[curView]) - if err != nil { - return err - } - cv.BgColor = g.BgColor - } curView = next return nil