diff options
| author | Jesse Duffield <jessedduffield@gmail.com> | 2018-12-08 16:54:54 +1100 |
|---|---|---|
| committer | Jesse Duffield <jessedduffield@gmail.com> | 2018-12-11 22:02:12 +1100 |
| commit | 9489a9447396b30bca86ea3df201cacfdffdb1a9 (patch) | |
| tree | ae251c28096f2bde6b1647603852782c58329d4c /pkg/gui/staging_panel.go | |
| parent | e0ff46fe53503d74fc63c90fc5ddc4d9468b60d5 (diff) | |
Make merge panel its own panel
Diffstat (limited to 'pkg/gui/staging_panel.go')
| -rw-r--r-- | pkg/gui/staging_panel.go | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/pkg/gui/staging_panel.go b/pkg/gui/staging_panel.go index 1408cfb45..777da08c2 100644 --- a/pkg/gui/staging_panel.go +++ b/pkg/gui/staging_panel.go @@ -76,7 +76,7 @@ func (gui *Gui) handleStagingEscape(g *gocui.Gui, v *gocui.View) error { gui.State.Panels.Staging = nil - return gui.switchFocus(gui.g, nil, gui.getFilesView(gui.g)) + return gui.switchFocus(gui.g, nil, gui.getFilesView()) } func (gui *Gui) handleStagingPrevLine(g *gocui.Gui, v *gocui.View) error { @@ -138,7 +138,7 @@ func (gui *Gui) handleCycleLine(prev bool) error { // focusLineAndHunk works out the best focus for the staging panel given the // selected line and size of the hunk func (gui *Gui) focusLineAndHunk() error { - stagingView := gui.getStagingView(gui.g) + stagingView := gui.getStagingView() state := gui.State.Panels.Staging lineNumber := state.StageableLines[state.SelectedLine] @@ -209,7 +209,7 @@ func (gui *Gui) handleStageLineOrHunk(hunk bool) error { return err } - if err := gui.refreshFiles(gui.g); err != nil { + if err := gui.refreshFiles(); err != nil { return err } if err := gui.refreshStagingPanel(); err != nil { |