From 069c7fb669a051227f626f0f1b4bcabf06dfd112 Mon Sep 17 00:00:00 2001
From: Sven Dowideit <SvenDowideit@home.org.au>
Date: Sat, 17 Aug 2019 15:57:46 +1000
Subject: [PATCH] use the view list to build the view

Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
---
 pkg/gui/gui.go    |  2 +-
 pkg/gui/layout.go | 15 ++++++++-------
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/pkg/gui/gui.go b/pkg/gui/gui.go
index cd7aafab..91ecb253 100644
--- a/pkg/gui/gui.go
+++ b/pkg/gui/gui.go
@@ -147,7 +147,7 @@ func NewGui(log *logrus.Entry, dockerCommand *commands.DockerCommand, oSCommand
 		SessionIndex: 0,
 	}
 
-	cyclableViews := []string{"project", "containers", "images"}
+	cyclableViews := []string{"project", "containers", "images", "volumes"}
 	if dockerCommand.InDockerComposeProject || config.DockerSwarm {
 		cyclableViews = []string{"project", "services", "containers", "images", "volumes"}
 	}
diff --git a/pkg/gui/layout.go b/pkg/gui/layout.go
index 65110a92..e21eb78c 100644
--- a/pkg/gui/layout.go
+++ b/pkg/gui/layout.go
@@ -204,15 +204,16 @@ func (gui *Gui) layout(g *gocui.Gui) error {
 	}
 
 	aboveContainersView := "project"
-	if showServicesPanel {
-		aboveContainersView = "services"
-		addView(g, "services", "project", titles["services"], vHeights["services"])
+	for _, view := range gui.CyclableViews {
+		if view == aboveContainersView {
+			continue
+		}
+		if err = addView(g, view, aboveContainersView, titles[view], vHeights[view]); err != nil {
+			return err
+		}
+		aboveContainersView = view
 	}
 
-	addView(g, "containers", aboveContainersView, titles["containers"], vHeights["containers"])
-	addView(g, "images", "containers", titles["images"], vHeights["images"])
-	addView(g, "volumes", "images", titles["volumes"], vHeights["volumes"])
-
 	if v, err := g.SetView("options", appStatusOptionsBoundary-1, height-2, optionsVersionBoundary-1, height, 0); err != nil {
 		if err.Error() != "unknown view" {
 			return err