Skip to content

Re-run pager-rendered diff output after resize #5358

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
SergioChan wants to merge 1 commit into
base: master
Choose a base branch
from
+11 −4
Open

Re-run pager-rendered diff output after resize #5358

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 11 additions & 4 deletions pkg/gui/pty.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,18 +22,25 @@ func (gui *Gui) desiredPtySize(view *gocui.View) *pty.Winsize {

func (gui *Gui) onResize() error {
gui.Mutexes.PtyMutex.Lock()
defer gui.Mutexes.PtyMutex.Unlock()
hasPtyViews := len(gui.viewPtmxMap) > 0

for viewName, ptmx := range gui.viewPtmxMap {
// TODO: handle resizing properly: we need to actually clear the main view
// and re-read the output from our pty. Or we could just re-run the original
// command from scratch
// Resize any active ptys first so they match the new view dimensions.
view, _ := gui.g.View(viewName)
if err := pty.Setsize(ptmx, gui.desiredPtySize(view)); err != nil {
gui.Mutexes.PtyMutex.Unlock()
return utils.WrapError(err)
}
}

gui.Mutexes.PtyMutex.Unlock()

if hasPtyViews {
// Custom pagers can render based on width. Re-running the current side's main
// render after a resize ensures the diff output is regenerated for the new size.
gui.c.Context().CurrentSide().HandleRenderToMain()
}

return nil
}

Expand Down