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

stop resetting scroll all the time

Browse Source
This commit is contained in:
Jesse Duffield
2021-10-17 19:01:02 +11:00
parent e7c27b6f4a
commit d672b7342f
7 changed files with 131 additions and 142 deletions
Download Patch File Download Diff File Expand all files Collapse all files

63
pkg/gui/tasks_adapter.go
View File

@ -9,9 +9,10 @@ import (
)
func (gui *Gui) newCmdTask(view *gocui.View, cmd *exec.Cmd, prefix string) error {
cmdStr := strings.Join(cmd.Args, " ")
gui.Log.WithField(
"command",
strings.Join(cmd.Args, " "),
cmdStr,
).Debug("RunCommand")
_, height := view.Size()
@ -29,17 +30,7 @@ func (gui *Gui) newCmdTask(view *gocui.View, cmd *exec.Cmd, prefix string) error
return err
}
if err := manager.NewTask(manager.NewCmdTask(r, cmd, prefix, height+oy+10, nil)); err != nil {
return err
}
return nil
}
func (gui *Gui) newTask(view *gocui.View, f func(chan struct{}) error) error {
manager := gui.getManager(view)
if err := manager.NewTask(f); err != nil {
if err := manager.NewTask(manager.NewCmdTask(r, cmd, prefix, height+oy+10, nil), cmdStr); err != nil {
return err
}
@ -47,6 +38,16 @@ func (gui *Gui) newTask(view *gocui.View, f func(chan struct{}) error) error {
}
func (gui *Gui) newStringTask(view *gocui.View, str string) error {
// using str so that if rendering the exact same thing we don't reset the origin
return gui.newStringTaskWithKey(view, str, str)
}
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
return gui.newStringTaskWithKey(view, str, "")
}
func (gui *Gui) newStringTaskWithKey(view *gocui.View, str string, key string) error {
manager := gui.getManager(view)
f := func(stop chan struct{}) error {
@ -54,22 +55,7 @@ func (gui *Gui) newStringTask(view *gocui.View, str string) error {
return nil
}
if err := manager.NewTask(f); err != nil {
return err
}
return nil
}
func (gui *Gui) newStringTaskWithoutScroll(view *gocui.View, str string) error {
manager := gui.getManager(view)
f := func(stop chan struct{}) error {
gui.setViewContent(view, str)
return nil
}
if err := manager.NewTask(f); err != nil {
if err := manager.NewTask(f, key); err != nil {
return err
}
@ -97,8 +83,29 @@ func (gui *Gui) getManager(view *gocui.View) *tasks.ViewBufferManager {
})
},
func() {
// Need to check if the content of the view is well past the origin.
// It would be better to use .ViewLinesHeight here (given it considers
// wrapping) but when this function is called they haven't been written to yet.
linesHeight := view.LinesHeight()
_, height := view.Size()
_, originY := view.Origin()
if linesHeight < originY {
newOriginY := linesHeight - height
if newOriginY < 0 {
newOriginY = 0
}
err := view.SetOrigin(0, newOriginY)
if err != nil {
panic(err)
}
}
view.FlushStaleCells()
},
func() {
_ = view.SetOrigin(0, 0)
},
)
gui.viewBufferManagerMap[view.Name()] = manager
}