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

fix merge conflict scrolling

Browse Source
This commit is contained in:
Jesse Duffield 2021-10-22 21:48:43 +11:00
parent 2008c39516
commit 80a8e9b04d
1 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
pkg/gui/tasks_adapter.go
View File

@ -43,8 +43,20 @@ func (gui *Gui) newStringTask(view *gocui.View, str string) error {
} }
func (gui *Gui) newStringTaskWithoutScroll(view *gocui.View, str string) error { func (gui *Gui) newStringTaskWithoutScroll(view *gocui.View, str string) error {
// using empty key so that on subsequent calls we won't reset the view's origin manager := gui.getManager(view)
return gui.newStringTaskWithKey(view, str, "")
f := func(stop chan struct{}) error {
gui.setViewContent(view, str)
return nil
}
// Using empty key so that on subsequent calls we won't reset the view's origin.
// Note this means that we will be scrolling back to the top if we're switching from a different key
if err := manager.NewTask(f, ""); err != nil {
return err
}
return nil
} }
func (gui *Gui) newStringTaskWithKey(view *gocui.View, str string, key string) error { func (gui *Gui) newStringTaskWithKey(view *gocui.View, str string, key string) error {