utils-code/jesseduffield.lazygit
1
0
Fork 0
mirror of https://github.com/jesseduffield/lazygit.git synced 2026-09-11 08:06:25 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

Restore scroll and selection seamlessly when escaping to a focused main view

Browse source 
EscapeFromPatchExplorer re-renders the side panel's content back into the main
view and wants to land at the scroll position and selection the user had before
diving into staging/patch building. The previous version set the origin on the
next UI tick, after the placeholder had already been painted at the wrong
position, so the restore was visible as a jump.

Instead, ask the re-render itself to restore the scroll (via
ScrollToOriginYForNextTask), so the saved position is applied in the first
paint that shows the real content. The selection still needs the diff loaded
down to the selected line, so restore it via ReadToEnd once the content is
fully read; the scroll is no longer touched there.

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
This commit is contained in:
Stefan Haller 2026-06-04 17:04:48 +02:00
parent 3f542e7c35
commit 13115140db
1 changed files with 33 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

37
pkg/gui/controllers/helpers/patch_building_helper.go
View file

@ -59,18 +59,47 @@ func EscapeFromPatchExplorer(c *HelperCommon, context types.IPatchExplorerContex
listContext.GetList().SetSelectedLineIdx(snapshot.SidePanelSelectedLineIdx)
}
view := snapshot.MainView.GetView()
// Ask the upcoming re-render to restore the scroll position. Pushing the side
// panel re-renders its content into the main view via a cmd/pty task. Until
// that content is ready, the main view keeps showing the placeholder that
// CopyContent left in it (the view we're leaving) at its current scroll; the
// task then scrolls to the saved position as part of the first paint that
// shows the real content. Doing it this way (rather than setting the origin up
// front) avoids both a jump to the top and a misplaced placeholder frame.
if manager := c.GetViewBufferManagerForView(view); manager != nil {
manager.ScrollToOriginYForNextTask(snapshot.OriginY)
}
// Land on the side panel first (this re-renders the original content into the
// main view), then focus the main view on top of it.
c.Context().Push(snapshot.SidePanel, types.OnFocusOpts{})
c.Context().Push(snapshot.MainView, types.OnFocusOpts{})
// Restore the scroll position and selection on the next UI tick.
view := snapshot.MainView.GetView()
c.OnUIThread(func() error {
view.SetOrigin(view.OriginX(), snapshot.OriginY)
restore := func() {
view.FocusPoint(0, snapshot.SelectedLineIdx, false)
view.Highlight = true
view.HighlightInactive = false
}
// The scroll position is handled by the re-render above, but the selection
// still needs the content loaded down to the selected line, which happens
// asynchronously. Wait until the diff has been fully read before restoring
// it. We do this on the next UI tick, by which point the re-render task is
// live and ReadToEnd can hook into it.
c.OnUIThread(func() error {
manager := c.GetViewBufferManagerForView(view)
if manager == nil {
restore()
return nil
}
manager.ReadToEnd(func() {
c.OnUIThread(func() error {
restore()
return nil
})
})
return nil
})
}