diff options
| -rw-r--r-- | pkg/gui/commit_message_panel.go | 4 | ||||
| -rw-r--r-- | pkg/gui/context.go | 2 | ||||
| -rw-r--r-- | pkg/gui/credentials_panel.go | 8 |
3 files changed, 2 insertions, 12 deletions
diff --git a/pkg/gui/commit_message_panel.go b/pkg/gui/commit_message_panel.go index f84abcdeb..53151cdb5 100644 --- a/pkg/gui/commit_message_panel.go +++ b/pkg/gui/commit_message_panel.go @@ -57,10 +57,6 @@ func (gui *Gui) handleCommitClose(g *gocui.Gui, v *gocui.View) error { } func (gui *Gui) handleCommitMessageFocused() error { - if _, err := gui.g.SetViewOnTop("commitMessage"); err != nil { - return err - } - message := gui.Tr.TemplateLocalize( "CommitMessageConfirm", Teml{ diff --git a/pkg/gui/context.go b/pkg/gui/context.go index 199047da4..962e5aff2 100644 --- a/pkg/gui/context.go +++ b/pkg/gui/context.go @@ -155,8 +155,6 @@ func (gui *Gui) activateContext(c Context) error { return err } - // return gui.newLineFocused(newView) - if err := c.HandleFocus(); err != nil { return err } diff --git a/pkg/gui/credentials_panel.go b/pkg/gui/credentials_panel.go index d1eed5b25..a9dc11417 100644 --- a/pkg/gui/credentials_panel.go +++ b/pkg/gui/credentials_panel.go @@ -58,15 +58,11 @@ func (gui *Gui) handleCloseCredentialsView(g *gocui.Gui, v *gocui.View) error { } func (gui *Gui) handleCredentialsViewFocused() error { - if _, err := gui.g.SetViewOnTop("credentials"); err != nil { - return err - } - message := gui.Tr.TemplateLocalize( "CloseConfirm", Teml{ - "keyBindClose": "esc", - "keyBindConfirm": "enter", + "keyBindClose": gui.getKeyDisplay("universal.return"), + "keyBindConfirm": gui.getKeyDisplay("universal.confirm"), }, ) gui.renderString("options", message) |