From e2446dab8ce4596652ef2a619c454d730e5851ae Mon Sep 17 00:00:00 2001 From: Sven Dowideit Date: Sat, 17 Aug 2019 16:01:48 +1000 Subject: [PATCH] And add the first view into the loop so we can switch that one too Signed-off-by: Sven Dowideit --- pkg/gui/layout.go | 27 +++++++++++++-------------- 1 file changed, 13 insertions(+), 14 deletions(-) diff --git a/pkg/gui/layout.go b/pkg/gui/layout.go index e21eb78c..c10665bb 100644 --- a/pkg/gui/layout.go +++ b/pkg/gui/layout.go @@ -195,21 +195,20 @@ func (gui *Gui) layout(g *gocui.Gui) error { titles["containers"] = gui.Tr.ContainersTitle } - if v, err := g.SetView("project", 0, 0, leftSideWidth, vHeights["project"]-1, gocui.BOTTOM|gocui.RIGHT); err != nil { - if err.Error() != "unknown view" { - return err - } - v.Title = titles["project"] - v.FgColor = gocui.ColorDefault - } - - aboveContainersView := "project" + aboveContainersView := "" for _, view := range gui.CyclableViews { - if view == aboveContainersView { - continue - } - if err = addView(g, view, aboveContainersView, titles[view], vHeights[view]); err != nil { - return err + if aboveContainersView == "" { + if v, err := g.SetView(view, 0, 0, leftSideWidth, vHeights[view]-1, gocui.BOTTOM|gocui.RIGHT); err != nil { + if err.Error() != "unknown view" { + return err + } + v.Title = titles[view] + v.FgColor = gocui.ColorDefault + } + } else { + if err = addView(g, view, aboveContainersView, titles[view], vHeights[view]); err != nil { + return err + } } aboveContainersView = view }