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/stash_panel.go | |
| parent | e0ff46fe53503d74fc63c90fc5ddc4d9468b60d5 (diff) | |
Make merge panel its own panel
Diffstat (limited to 'pkg/gui/stash_panel.go')
| -rw-r--r-- | pkg/gui/stash_panel.go | 17 |
1 files changed, 13 insertions, 4 deletions
diff --git a/pkg/gui/stash_panel.go b/pkg/gui/stash_panel.go index 306d61771..4ee19793c 100644 --- a/pkg/gui/stash_panel.go +++ b/pkg/gui/stash_panel.go @@ -46,11 +46,14 @@ func (gui *Gui) refreshStashEntries(g *gocui.Gui) error { return err } - v := gui.getStashView(gui.g) + v := gui.getStashView() v.Clear() fmt.Fprint(v, list) - return gui.resetOrigin(v) + if err := gui.resetOrigin(v); err != nil { + return err + } + return nil }) return nil } @@ -59,6 +62,9 @@ func (gui *Gui) handleStashNextLine(g *gocui.Gui, v *gocui.View) error { panelState := gui.State.Panels.Stash gui.changeSelectedLine(&panelState.SelectedLine, len(gui.State.StashEntries), false) + if err := gui.resetOrigin(gui.getMainView()); err != nil { + return err + } return gui.handleStashEntrySelect(gui.g, v) } @@ -66,6 +72,9 @@ func (gui *Gui) handleStashPrevLine(g *gocui.Gui, v *gocui.View) error { panelState := gui.State.Panels.Stash gui.changeSelectedLine(&panelState.SelectedLine, len(gui.State.StashEntries), true) + if err := gui.resetOrigin(gui.getMainView()); err != nil { + return err + } return gui.handleStashEntrySelect(gui.g, v) } @@ -102,7 +111,7 @@ func (gui *Gui) stashDo(g *gocui.Gui, v *gocui.View, method string) error { gui.createErrorPanel(g, err.Error()) } gui.refreshStashEntries(g) - return gui.refreshFiles(g) + return gui.refreshFiles() } func (gui *Gui) handleStashSave(g *gocui.Gui, filesView *gocui.View) error { @@ -114,7 +123,7 @@ func (gui *Gui) handleStashSave(g *gocui.Gui, filesView *gocui.View) error { gui.createErrorPanel(g, err.Error()) } gui.refreshStashEntries(g) - return gui.refreshFiles(g) + return gui.refreshFiles() }) return nil } |