diff options
| author | Jesse Duffield <jessedduffield@gmail.com> | 2020-08-16 13:58:29 +1000 |
|---|---|---|
| committer | Jesse Duffield <jessedduffield@gmail.com> | 2020-08-23 14:29:18 +1000 |
| commit | 7f89113245307be8a1642105014e9ce51a47210f (patch) | |
| tree | 0b1237c4bdd4a465bedb7cc49c8372d0bfc46ea5 /pkg/gui/credentials_panel.go | |
| parent | 0ea0c486310558e26af7ad6e4fcf17f57c2b62e3 (diff) | |
WIP
Diffstat (limited to 'pkg/gui/credentials_panel.go')
| -rw-r--r-- | pkg/gui/credentials_panel.go | 17 |
1 files changed, 7 insertions, 10 deletions
diff --git a/pkg/gui/credentials_panel.go b/pkg/gui/credentials_panel.go index ede5c865c..d1eed5b25 100644 --- a/pkg/gui/credentials_panel.go +++ b/pkg/gui/credentials_panel.go @@ -20,10 +20,11 @@ func (gui *Gui) promptUserForCredential(passOrUname string) string { credentialsView.Title = gui.Tr.SLocalize("CredentialsPassword") credentialsView.Mask = '*' } - err := gui.switchFocus(gui.g.CurrentView(), credentialsView) - if err != nil { + + if err := gui.switchContext(gui.Contexts.Credentials.Context); err != nil { return err } + gui.RenderCommitLength() return nil }) @@ -38,15 +39,11 @@ func (gui *Gui) handleSubmitCredential(g *gocui.Gui, v *gocui.View) error { gui.credentials <- message v.Clear() _ = v.SetCursor(0, 0) - _, _ = g.SetViewOnBottom("credentials") - nextView, err := gui.g.View("confirmation") - if err != nil { - nextView = gui.getFilesView() - } - err = gui.switchFocus(nil, nextView) - if err != nil { + _, _ = g.SetViewOnBottom("credentials") // TODO: move to context code + if err := gui.returnFromContext(); err != nil { return err } + return gui.refreshSidePanels(refreshOptions{}) } @@ -57,7 +54,7 @@ func (gui *Gui) handleCloseCredentialsView(g *gocui.Gui, v *gocui.View) error { } gui.credentials <- "" - return gui.switchFocus(nil, gui.getFilesView()) + return gui.returnFromContext() } func (gui *Gui) handleCredentialsViewFocused() error { |