summaryrefslogtreecommitdiffstats
path: root/pkg/gui/commit_files_panel.go
diff options
context:
space:
mode:
authorJesse Duffield <jessedduffield@gmail.com>2020-08-15 17:01:43 +1000
committerJesse Duffield <jessedduffield@gmail.com>2020-08-15 18:01:43 +1000
commit15229bbdab5d99ce7f390a7e215a572ab155a5ac (patch)
tree37b8bf40eef59c13b198b14dce679e1afcfcc85b /pkg/gui/commit_files_panel.go
parent63e6eea9ecd52c908e75f9f1d456589d1574872e (diff)
more removing of g and v
Diffstat (limited to 'pkg/gui/commit_files_panel.go')
-rw-r--r--pkg/gui/commit_files_panel.go10
1 files changed, 5 insertions, 5 deletions
diff --git a/pkg/gui/commit_files_panel.go b/pkg/gui/commit_files_panel.go
index 720f77e55..0bddbb8e9 100644
--- a/pkg/gui/commit_files_panel.go
+++ b/pkg/gui/commit_files_panel.go
@@ -18,13 +18,13 @@ func (gui *Gui) getSelectedCommitFile() *commands.CommitFile {
func (gui *Gui) handleCommitFilesClick(g *gocui.Gui, v *gocui.View) error {
itemCount := len(gui.State.CommitFiles)
- handleSelect := gui.handleCommitFileSelect
+ handleSelect := gui.wrappedHandler(gui.handleCommitFileSelect)
selectedLine := &gui.State.Panels.CommitFiles.SelectedLine
return gui.handleClick(v, itemCount, selectedLine, handleSelect)
}
-func (gui *Gui) handleCommitFileSelect(g *gocui.Gui, v *gocui.View) error {
+func (gui *Gui) handleCommitFileSelect() error {
if gui.popupPanelFocused() {
return nil
}
@@ -44,7 +44,7 @@ func (gui *Gui) handleCommitFileSelect(g *gocui.Gui, v *gocui.View) error {
return err
}
- v.FocusPoint(0, gui.State.Panels.CommitFiles.SelectedLine)
+ gui.getCommitFilesView().FocusPoint(0, gui.State.Panels.CommitFiles.SelectedLine)
cmd := gui.OSCommand.ExecutableFromString(
gui.GitCommand.ShowCommitFileCmdStr(commitFile.Sha, commitFile.Name, false),
@@ -122,7 +122,7 @@ func (gui *Gui) refreshCommitFilesView() error {
displayStrings := presentation.GetCommitFileListDisplayStrings(gui.State.CommitFiles, gui.State.Diff.Ref)
gui.renderDisplayStrings(commitsFileView, displayStrings)
- return gui.handleCommitFileSelect(gui.g, commitsFileView)
+ return gui.handleCommitFileSelect()
}
func (gui *Gui) handleOpenOldCommitFile(g *gocui.Gui, v *gocui.View) error {
@@ -251,5 +251,5 @@ func (gui *Gui) enterCommitFile(selectedLineIdx int) error {
func (gui *Gui) onCommitFilesPanelSearchSelect(selectedLine int) error {
gui.State.Panels.CommitFiles.SelectedLine = selectedLine
- return gui.handleCommitFileSelect(gui.g, gui.getCommitFilesView())
+ return gui.handleCommitFileSelect()
}