diff options
| author | Jesse Duffield <jessedduffield@gmail.com> | 2020-08-15 16:36:39 +1000 |
|---|---|---|
| committer | Jesse Duffield <jessedduffield@gmail.com> | 2020-08-15 18:01:43 +1000 |
| commit | d9fa02c53bb9b401f1b5ca07e8ed239862052a42 (patch) | |
| tree | 9ce89793ba22ffc190ab6133365035dda4ec1ade /pkg/gui/patch_options_panel.go | |
| parent | c44ee71ad4ca44a407613c1e91f7d720acfa84f6 (diff) | |
clean up interface for popup panels
Diffstat (limited to 'pkg/gui/patch_options_panel.go')
| -rw-r--r-- | pkg/gui/patch_options_panel.go | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/pkg/gui/patch_options_panel.go b/pkg/gui/patch_options_panel.go index 4ec3cd228..5407e7c31 100644 --- a/pkg/gui/patch_options_panel.go +++ b/pkg/gui/patch_options_panel.go @@ -133,9 +133,15 @@ func (gui *Gui) handlePullPatchIntoWorkingTree() error { } if len(gui.trackedFiles()) > 0 { - return gui.createConfirmationPanel(gui.g, gui.g.CurrentView(), true, gui.Tr.SLocalize("MustStashTitle"), gui.Tr.SLocalize("MustStashWarning"), func(*gocui.Gui, *gocui.View) error { - return pull(true) - }, nil) + return gui.createConfirmationPanel(createConfirmationPanelOpts{ + returnToView: gui.g.CurrentView(), + returnFocusOnClose: true, + title: gui.Tr.SLocalize("MustStashTitle"), + prompt: gui.Tr.SLocalize("MustStashWarning"), + handleConfirm: func() error { + return pull(true) + }, + }) } else { return pull(false) } |