diff options
author | Jesse Duffield <jessedduffield@gmail.com> | 2019-12-08 21:23:51 +1100 |
---|---|---|
committer | Jesse Duffield <jessedduffield@gmail.com> | 2019-12-08 21:27:28 +1100 |
commit | dab78c8a632fa12a24db2247a5c7096c5166c91a (patch) | |
tree | b794061dbc48f9f3e20c8de6921a82f25a6c97ab /pkg/gui/files_panel.go | |
parent | 3f4613feb010fbafa405e8caa6b48e7e6bca3000 (diff) |
stop the files panel from stealing focus whenever files are refreshed
Diffstat (limited to 'pkg/gui/files_panel.go')
-rw-r--r-- | pkg/gui/files_panel.go | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/pkg/gui/files_panel.go b/pkg/gui/files_panel.go index 5f68f3fab..463db817e 100644 --- a/pkg/gui/files_panel.go +++ b/pkg/gui/files_panel.go @@ -27,15 +27,7 @@ func (gui *Gui) getSelectedFile(g *gocui.Gui) (*commands.File, error) { return gui.State.Files[selectedLine], nil } -func (gui *Gui) handleFileSelect(g *gocui.Gui, v *gocui.View) error { - return gui.selectFile(false) -} - func (gui *Gui) selectFile(alreadySelected bool) error { - if _, err := gui.g.SetCurrentView("files"); err != nil { - return err - } - file, err := gui.getSelectedFile(gui.g) if err != nil { if err != gui.Errors.ErrNoFiles { @@ -221,6 +213,14 @@ func (gui *Gui) allFilesStaged() bool { return true } +func (gui *Gui) focusAndSelectFile(g *gocui.Gui, v *gocui.View) error { + if _, err := gui.g.SetCurrentView("files"); err != nil { + return err + } + + return gui.selectFile(false) +} + func (gui *Gui) handleStageAll(g *gocui.Gui, v *gocui.View) error { var err error if gui.allFilesStaged() { @@ -236,7 +236,7 @@ func (gui *Gui) handleStageAll(g *gocui.Gui, v *gocui.View) error { return err } - return gui.handleFileSelect(gui.g, v) + return gui.selectFile(false) } func (gui *Gui) handleIgnoreFile(g *gocui.Gui, v *gocui.View) error { |