From d0f1e8393a5c28e24d6031239a1e734bb2285364 Mon Sep 17 00:00:00 2001 From: Julien Breux Date: Mon, 14 Aug 2017 11:47:32 +0200 Subject: [PATCH] Clean views and actions --- actions.go | 7 +++++-- views.go | 11 ++--------- 2 files changed, 7 insertions(+), 11 deletions(-) diff --git a/actions.go b/actions.go index 65ba1a6..e21ca6f 100644 --- a/actions.go +++ b/actions.go @@ -11,12 +11,15 @@ func actionGlobalQuit(g *gocui.Gui, v *gocui.View) error { // Global action: Toggle debug func actionGlobalToggleDebug(g *gocui.Gui, v *gocui.View) error { + vn := "debug" + if !DEBUG_DISPLAYED { debug(g, "Action: Toggle debug display (show)") - g.SetViewOnTop("debug") + g.SetViewOnTop(vn) + g.SetCurrentView(vn) } else { debug(g, "Action: Toggle debug display (hide)") - g.SetViewOnBottom("debug") + g.SetViewOnBottom(vn) // TODO g.SetCurrentView("pods") } diff --git a/views.go b/views.go index 6af6816..a9b7ff4 100644 --- a/views.go +++ b/views.go @@ -41,21 +41,14 @@ func viewTitle(g *gocui.Gui, lMaxX int, lMaxY int) error { // View: Debug func viewDebug(g *gocui.Gui, lMaxX int, lMaxY int) error { - // Main view - minX := 2 - maxX := lMaxX - 4 - minY := 2 - maxY := lMaxY - 2 - if v, err := g.SetView("debug", minX, minY, maxX, maxY); err != nil { + if v, err := g.SetView("debug", 2, 2, lMaxX-4, lMaxY-2); err != nil { if err != gocui.ErrUnknownView { return err } - // Configure view + // Settings v.Title = " Debug " v.Autoscroll = true - g.SetViewOnTop(v.Name()) - g.SetCurrentView(v.Name()) } return nil