summaryrefslogtreecommitdiffstats
path: root/pkg/gui/staging_panel.go
diff options
context:
space:
mode:
authorJesse Duffield <jessedduffield@gmail.com>2020-08-23 13:09:36 +1000
committerJesse Duffield <jessedduffield@gmail.com>2020-08-23 14:29:18 +1000
commit3eb3de3edcb882a12a888b3ec52f3f7848f9bbd9 (patch)
tree96597770bfb4dad586109d76353efc82d58629d7 /pkg/gui/staging_panel.go
parent94601b4dc951de9b1efa08120148d2d9766b637c (diff)
allow explicitly managing focus
Diffstat (limited to 'pkg/gui/staging_panel.go')
-rw-r--r--pkg/gui/staging_panel.go12
1 files changed, 10 insertions, 2 deletions
diff --git a/pkg/gui/staging_panel.go b/pkg/gui/staging_panel.go
index a9b351ba8..90e776024 100644
--- a/pkg/gui/staging_panel.go
+++ b/pkg/gui/staging_panel.go
@@ -105,11 +105,19 @@ func (gui *Gui) handleResetSelection(g *gocui.Gui, v *gocui.View) error {
if !gui.Config.GetUserConfig().GetBool("gui.skipUnstageLineWarning") {
return gui.ask(askOpts{
- title: gui.Tr.SLocalize("UnstageLinesTitle"),
- prompt: gui.Tr.SLocalize("UnstageLinesPrompt"),
+ title: gui.Tr.SLocalize("UnstageLinesTitle"),
+ prompt: gui.Tr.SLocalize("UnstageLinesPrompt"),
+ handlersManageFocus: true,
handleConfirm: func() error {
+ if err := gui.switchContext(gui.Contexts.Staging.Context); err != nil {
+ return err
+ }
+
return gui.applySelection(true)
},
+ handleClose: func() error {
+ return gui.switchContext(gui.Contexts.Staging.Context)
+ },
})
} else {
return gui.applySelection(true)