sysutils/lazygit
1
0
Fork 0
mirror of https://github.com/jesseduffield/lazygit.git synced 2025-07-30 03:23:08 +03:00
Code Activity

fix race condition when scrolling to merge conflict

Browse Source
This commit is contained in:
Jesse Duffield
2020-05-19 18:01:29 +10:00
parent 003e45d2f5
commit 36ac764133
8 changed files with 54 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/gui/layout.go
View File

@ -398,7 +398,7 @@ func (gui *Gui) layout(g *gocui.Gui) error {
searchPrefixView.BgColor = gocui.ColorDefault
searchPrefixView.FgColor = gocui.ColorGreen
searchPrefixView.Frame = false
gui.setViewContent(gui.g, searchPrefixView, searchPrefix)
gui.setViewContent(searchPrefixView, searchPrefix)
}
if searchView, err := g.SetView("search", appStatusOptionsBoundary-1+searchViewOffset+len(searchPrefix), height-2+searchViewOffset, optionsVersionBoundary+searchViewOffset, height+searchViewOffset, 0); err != nil {
@ -440,7 +440,7 @@ func (gui *Gui) layout(g *gocui.Gui) error {
}
}
if gui.State.OldInformation != information {
gui.setViewContent(g, informationView, information)
gui.setViewContent(informationView, information)
gui.State.OldInformation = information
}