From 4c916477bafcc97b494362cef80e14a50fd9404e Mon Sep 17 00:00:00 2001
From: Jesse Duffield <jessedduffield@gmail.com>
Date: Sun, 16 Jun 2019 11:05:19 +1000
Subject: [PATCH] refactor

---
 pkg/gui/layout.go       | 64 ++++++++++++++++++++++++-----------------
 pkg/gui/view_helpers.go | 14 ++-------
 2 files changed, 40 insertions(+), 38 deletions(-)

diff --git a/pkg/gui/layout.go b/pkg/gui/layout.go
index 3d4ce1a2..d15388f0 100644
--- a/pkg/gui/layout.go
+++ b/pkg/gui/layout.go
@@ -39,6 +39,12 @@ func (gui *Gui) onFocusLost(v *gocui.View, newView *gocui.View) error {
 	if v == nil {
 		return nil
 	}
+
+	// refocusing because in responsive mode (when the window is very short) we want to ensure that after the view size changes we can still see the last selected item
+	if err := gui.focusPointInView(v); err != nil {
+		return err
+	}
+
 	gui.Log.Info(v.Name() + " focus lost")
 	return nil
 }
@@ -47,6 +53,11 @@ func (gui *Gui) onFocus(v *gocui.View) error {
 	if v == nil {
 		return nil
 	}
+
+	if err := gui.focusPointInView(v); err != nil {
+		return err
+	}
+
 	gui.Log.Info(v.Name() + " focus gained")
 	return nil
 }
@@ -260,35 +271,36 @@ func (gui *Gui) layout(g *gocui.Gui) error {
 		}
 	}
 
-	type listViewState struct {
-		selectedLine int
-		lineCount    int
-	}
-
-	// TODO: find out if I should add the services view to this.
-	listViews := map[*gocui.View]listViewState{
-		containersView: {selectedLine: gui.State.Panels.Containers.SelectedLine, lineCount: len(gui.DockerCommand.DisplayContainers)},
-		imagesView:     {selectedLine: gui.State.Panels.Images.SelectedLine, lineCount: len(gui.DockerCommand.Images)},
-		volumesView:    {selectedLine: gui.State.Panels.Volumes.SelectedLine, lineCount: len(gui.DockerCommand.Volumes)},
-		servicesView:   {selectedLine: gui.State.Panels.Services.SelectedLine, lineCount: len(gui.DockerCommand.Services)},
-	}
-
-	// menu view might not exist so we check to be safe
-	if menuView, err := gui.g.View("menu"); err == nil {
-		listViews[menuView] = listViewState{selectedLine: gui.State.Panels.Menu.SelectedLine, lineCount: gui.State.MenuItemCount}
-	}
-	for view, state := range listViews {
-		// check if the selected line is now out of view and if so refocus it
-		if view == gui.g.CurrentView() {
-			if err := gui.focusPoint(0, state.selectedLine, state.lineCount, view); err != nil {
-				return err
-			}
-		}
-	}
-
 	// here is a good place log some stuff
 	// if you download humanlog and do tail -f development.log | humanlog
 	// this will let you see these branches as prettified json
 	// gui.Log.Info(utils.AsJson(gui.State.Branches[0:4]))
 	return gui.resizeCurrentPopupPanel(g)
 }
+
+type listViewState struct {
+	selectedLine int
+	lineCount    int
+}
+
+func (gui *Gui) focusPointInView(view *gocui.View) error {
+	if view == nil {
+		return nil
+	}
+
+	listViews := map[string]listViewState{
+		"containers": {selectedLine: gui.State.Panels.Containers.SelectedLine, lineCount: len(gui.DockerCommand.DisplayContainers)},
+		"images":     {selectedLine: gui.State.Panels.Images.SelectedLine, lineCount: len(gui.DockerCommand.Images)},
+		"volumes":    {selectedLine: gui.State.Panels.Volumes.SelectedLine, lineCount: len(gui.DockerCommand.Volumes)},
+		"services":   {selectedLine: gui.State.Panels.Services.SelectedLine, lineCount: len(gui.DockerCommand.Services)},
+		"menu":       listViewState{selectedLine: gui.State.Panels.Menu.SelectedLine, lineCount: gui.State.MenuItemCount},
+	}
+
+	if state, ok := listViews[view.Name()]; ok {
+		if err := gui.focusPoint(0, state.selectedLine, state.lineCount, view); err != nil {
+			return err
+		}
+	}
+
+	return nil
+}
diff --git a/pkg/gui/view_helpers.go b/pkg/gui/view_helpers.go
index 94367c64..b93db426 100644
--- a/pkg/gui/view_helpers.go
+++ b/pkg/gui/view_helpers.go
@@ -158,34 +158,24 @@ func (gui *Gui) focusPoint(selectedX int, selectedY int, lineCount int, v *gocui
 
 	ly := utils.Max(height-1, 0)
 
-	// if line is above origin, move origin and set cursor to zero
-	// if line is below origin + height, move origin and set cursor to max
-	// otherwise set cursor to value - origin
-	gui.Log.Warn("ly: ", ly)
-	gui.Log.Warn("lineCount: ", lineCount)
-	gui.Log.Warn("selectedY: ", selectedY)
-	gui.Log.Warn("oy: ", oy)
-	gui.Log.Warn("cy: ", cy)
-
 	windowStart := oy
 	windowEnd := oy + ly
 
 	if selectedY < windowStart {
-		gui.Log.Warn("one")
 		oy = utils.Max(oy-(windowStart-selectedY), 0)
 	} else if selectedY > windowEnd {
-		gui.Log.Warn("two")
 		oy += (selectedY - windowEnd)
 	}
 
 	if windowEnd > lineCount-1 {
-		gui.Log.Warn("three")
 		shiftAmount := (windowEnd - (lineCount - 1))
 		oy = utils.Max(oy-shiftAmount, 0)
 	}
+
 	if originalOy != oy {
 		_ = v.SetOrigin(ox, oy)
 	}
+
 	cy = selectedY - oy
 	if originalCy != cy {
 		_ = v.SetCursor(cx, selectedY-oy)