ComputerSurge/lazygit
3
0
Fork 0
Code Pull Requests 1 Activity

fix merge scroll bug

Browse Source
This commit is contained in:
Jesse Duffield
2022-01-16 23:09:01 +11:00
parent 0092c9d08d
commit 99035959a1
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
pkg/gui/merge_panel.go
View File

@@ -182,7 +182,12 @@ func (gui *Gui) renderConflicts(state *mergeconflicts.State, hasFocus bool) (boo
content := mergeconflicts.ColoredConflictFile(cat, state, hasFocus) content := mergeconflicts.ColoredConflictFile(cat, state, hasFocus)
if !gui.State.Panels.Merging.UserVerticalScrolling { if !gui.State.Panels.Merging.UserVerticalScrolling {
gui.centerYPos(gui.Views.Main, state.GetConflictMiddle()) // TODO: find a way to not have to do this OnUIThread thing. Why doesn't it work
// without it given that we're calling the 'no scroll' variant below?
gui.OnUIThread(func() error {
gui.centerYPos(gui.Views.Main, state.GetConflictMiddle())
return nil
})
} }
return true, gui.refreshMainViews(refreshMainOpts{ return true, gui.refreshMainViews(refreshMainOpts{