diff options
author | Jesse Duffield <jessedduffield@gmail.com> | 2020-08-21 20:08:42 +1000 |
---|---|---|
committer | Jesse Duffield <jessedduffield@gmail.com> | 2020-08-23 14:29:18 +1000 |
commit | 9b42cd22144c4bf590513d7ad9dd37e922268889 (patch) | |
tree | f9c5cef57a11f423b30900a53e32d215ba1d5738 | |
parent | 2d90e1e8ee5ccb3d2acd8678e68137645c9e65bd (diff) |
slightly better
-rw-r--r-- | pkg/gui/commit_files_panel.go | 4 | ||||
-rw-r--r-- | pkg/gui/window.go | 6 |
2 files changed, 7 insertions, 3 deletions
diff --git a/pkg/gui/commit_files_panel.go b/pkg/gui/commit_files_panel.go index 9854cfc77..cb41c4a25 100644 --- a/pkg/gui/commit_files_panel.go +++ b/pkg/gui/commit_files_panel.go @@ -218,9 +218,7 @@ func (gui *Gui) enterCommitFile(selectedLineIdx int) error { func (gui *Gui) switchToCommitFilesContext(refName string, isStash bool, context Context, windowName string) error { // sometimes the commitFiles view is already shown in another window, so we need to ensure that window // no longer considers the commitFiles view as its main view. - - window := gui.getWindowForViewName("commitFiles") - gui.State.WindowViewNameMap[window] = window + gui.resetWindowForView("commitFiles") gui.State.Panels.CommitFiles.SelectedLineIdx = 0 gui.State.Panels.CommitFiles.refName = refName diff --git a/pkg/gui/window.go b/pkg/gui/window.go index 8d2f3ff18..8931ff07b 100644 --- a/pkg/gui/window.go +++ b/pkg/gui/window.go @@ -34,3 +34,9 @@ func (gui *Gui) setViewAsActiveForWindow(viewName string) { func (gui *Gui) currentWindow() string { return gui.getWindowForViewName(gui.currentViewName()) } + +func (gui *Gui) resetWindowForView(viewName string) { + window := gui.getWindowForViewName(viewName) + // we assume here that the window contains as its default view a view with the same name as the window + gui.State.WindowViewNameMap[window] = window +} |