sysutils/lazygit
1
0
Fork 0
mirror of https://github.com/jesseduffield/lazygit.git synced 2025-07-31 14:24:25 +03:00
Code Activity

fix merge conflict panel not rendering

Browse Source
This commit is contained in:
Jesse Duffield
2021-04-11 10:05:19 +10:00
parent e092da5f78
commit a9fbc9eda1
4 changed files with 14 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/gui/layout.go
View File

@ -64,7 +64,7 @@ func (gui *Gui) createAllViews() error {
gui.Views.SearchPrefix.BgColor = gocui.ColorDefault
gui.Views.SearchPrefix.FgColor = gocui.ColorGreen
gui.Views.SearchPrefix.Frame = false
gui.setViewContent(gui.Views.SearchPrefix, SEARCH_PREFIX)
gui.setViewContentSync(gui.Views.SearchPrefix, SEARCH_PREFIX)
gui.Views.Stash.Title = gui.Tr.StashTitle
gui.Views.Stash.FgColor = theme.GocuiDefaultTextColor
@ -248,7 +248,7 @@ func (gui *Gui) layout(g *gocui.Gui) error {
gui.Views.CommitFiles.Visible = gui.getViewNameForWindow(gui.State.Contexts.CommitFiles.GetWindowName()) == "commitFiles"
if gui.State.OldInformation != informationStr {
gui.setViewContent(gui.Views.Information, informationStr)
gui.setViewContentSync(gui.Views.Information, informationStr)
gui.State.OldInformation = informationStr
}