From 63e6eea9ecd52c908e75f9f1d456589d1574872e Mon Sep 17 00:00:00 2001
From: Jesse Duffield <jessedduffield@gmail.com>
Date: Sat, 15 Aug 2020 16:54:48 +1000
Subject: files view

---
 pkg/gui/files_panel.go  | 4 ++--
 pkg/gui/list_view.go    | 4 ++--
 pkg/gui/view_helpers.go | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'pkg')

diff --git a/pkg/gui/files_panel.go b/pkg/gui/files_panel.go
index be95627be..6354e17bb 100644
--- a/pkg/gui/files_panel.go
+++ b/pkg/gui/files_panel.go
@@ -216,7 +216,7 @@ func (gui *Gui) allFilesStaged() bool {
 	return true
 }
 
-func (gui *Gui) focusAndSelectFile(g *gocui.Gui, v *gocui.View) error {
+func (gui *Gui) focusAndSelectFile() error {
 	if _, err := gui.g.SetCurrentView("files"); err != nil {
 		return err
 	}
@@ -655,5 +655,5 @@ func (gui *Gui) handleCreateResetToUpstreamMenu(g *gocui.Gui, v *gocui.View) err
 
 func (gui *Gui) onFilesPanelSearchSelect(selectedLine int) error {
 	gui.State.Panels.Files.SelectedLine = selectedLine
-	return gui.focusAndSelectFile(gui.g, gui.getFilesView())
+	return gui.focusAndSelectFile()
 }
diff --git a/pkg/gui/list_view.go b/pkg/gui/list_view.go
index bea7ce233..c48f51ce5 100644
--- a/pkg/gui/list_view.go
+++ b/pkg/gui/list_view.go
@@ -121,8 +121,8 @@ func (gui *Gui) getListViews() []*listView {
 			viewName:                "files",
 			getItemsLength:          func() int { return len(gui.State.Files) },
 			getSelectedLineIdxPtr:   func() *int { return &gui.State.Panels.Files.SelectedLine },
-			handleFocus:             gui.focusAndSelectFile,
-			handleItemSelect:        gui.focusAndSelectFile,
+			handleFocus:             gui.wrappedHandler(gui.focusAndSelectFile),
+			handleItemSelect:        gui.wrappedHandler(gui.focusAndSelectFile),
 			handleClickSelectedItem: gui.handleFilePress,
 			gui:                     gui,
 			rendersToMainView:       true,
diff --git a/pkg/gui/view_helpers.go b/pkg/gui/view_helpers.go
index 2ab2bb8d3..2114ac073 100644
--- a/pkg/gui/view_helpers.go
+++ b/pkg/gui/view_helpers.go
@@ -223,7 +223,7 @@ func (gui *Gui) newLineFocused(g *gocui.Gui, v *gocui.View) error {
 	case "status":
 		return gui.handleStatusSelect()
 	case "files":
-		return gui.focusAndSelectFile(g, v)
+		return gui.focusAndSelectFile()
 	case "branches":
 		branchesView := gui.getBranchesView()
 		switch branchesView.Context {
-- 
cgit v1.2.3