go/lazygit
1
0
Fork 0
mirror of https://github.com/jesseduffield/lazygit.git synced 2025-02-03 13:21:56 +02:00
Code Issues Releases Activity

slightly better

Browse Source
This commit is contained in:
Jesse Duffield 2020-08-21 20:08:42 +10:00
parent 2d90e1e8ee
commit 9b42cd2214
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/gui/commit_files_panel.go
View File

@ -218,9 +218,7 @@ func (gui *Gui) enterCommitFile(selectedLineIdx int) error {
func (gui *Gui) switchToCommitFilesContext(refName string, isStash bool, context Context, windowName string) 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 // 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. // no longer considers the commitFiles view as its main view.
gui.resetWindowForView("commitFiles")
window := gui.getWindowForViewName("commitFiles")
gui.State.WindowViewNameMap[window] = window
gui.State.Panels.CommitFiles.SelectedLineIdx = 0 gui.State.Panels.CommitFiles.SelectedLineIdx = 0
gui.State.Panels.CommitFiles.refName = refName gui.State.Panels.CommitFiles.refName = refName

6
pkg/gui/window.go
View File

@ -34,3 +34,9 @@ func (gui *Gui) setViewAsActiveForWindow(viewName string) {
func (gui *Gui) currentWindow() string { func (gui *Gui) currentWindow() string {
return gui.getWindowForViewName(gui.currentViewName()) 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
}