From dc911906b3ded868074549717bdf653dd6ddb7a8 Mon Sep 17 00:00:00 2001 From: Tommy Nguyen Date: Tue, 21 Aug 2018 06:36:20 -0400 Subject: [PATCH] Esc will quit when not in popup, fixes #197 --- pkg/gui/gui.go | 5 ++++- pkg/gui/keybindings.go | 1 + 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/pkg/gui/gui.go b/pkg/gui/gui.go index 66777b3a6..3e0bd9936 100644 --- a/pkg/gui/gui.go +++ b/pkg/gui/gui.go @@ -363,5 +363,8 @@ func (gui *Gui) RunWithSubprocesses() { } func (gui *Gui) quit(g *gocui.Gui, v *gocui.View) error { - return gocui.ErrQuit + if v.Name() != "commitMessage" && v.Name() != "confirmation" { + return gocui.ErrQuit + } + return nil } diff --git a/pkg/gui/keybindings.go b/pkg/gui/keybindings.go index 68cccda6b..d09ed64b1 100644 --- a/pkg/gui/keybindings.go +++ b/pkg/gui/keybindings.go @@ -16,6 +16,7 @@ func (gui *Gui) keybindings(g *gocui.Gui) error { bindings := []Binding{ {ViewName: "", Key: 'q', Modifier: gocui.ModNone, Handler: gui.quit}, {ViewName: "", Key: gocui.KeyCtrlC, Modifier: gocui.ModNone, Handler: gui.quit}, + {ViewName: "", Key: gocui.KeyEsc, Modifier: gocui.ModNone, Handler: gui.quit}, {ViewName: "", Key: gocui.KeyPgup, Modifier: gocui.ModNone, Handler: gui.scrollUpMain}, {ViewName: "", Key: gocui.KeyPgdn, Modifier: gocui.ModNone, Handler: gui.scrollDownMain}, {ViewName: "", Key: gocui.KeyCtrlU, Modifier: gocui.ModNone, Handler: gui.scrollUpMain},