go/lazygit
1
0
Fork 0
mirror of https://github.com/jesseduffield/lazygit.git synced 2025-04-27 12:32:37 +02:00
Code Issues Releases Activity

fix delta again

Browse Source
This commit is contained in:
Jesse Duffield 2021-11-22 20:58:40 +11:00
parent 8abc953582
commit 02bf6a5c17
1 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
pkg/gui/pty.go
View File

@ -12,18 +12,24 @@ import (
"github.com/jesseduffield/gocui" "github.com/jesseduffield/gocui"
) )
func (gui *Gui) desiredPtySize() *pty.Winsize {
width, height := gui.Views.Main.Size()
return &pty.Winsize{Cols: uint16(width), Rows: uint16(height)}
}
func (gui *Gui) onResize() error { func (gui *Gui) onResize() error {
if gui.State.Ptmx == nil { if gui.State.Ptmx == nil {
return nil return nil
} }
width, height := gui.Views.Main.Size()
if err := pty.Setsize(gui.State.Ptmx, &pty.Winsize{Cols: uint16(width), Rows: uint16(height)}); err != nil { // 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
if err := pty.Setsize(gui.State.Ptmx, gui.desiredPtySize()); err != nil {
return err return err
} }
// TODO: handle resizing properly
return nil return nil
} }
@ -52,7 +58,7 @@ func (gui *Gui) newPtyTask(view *gocui.View, cmd *exec.Cmd, prefix string) error
manager := gui.getManager(view) manager := gui.getManager(view)
start := func() (*exec.Cmd, io.Reader) { start := func() (*exec.Cmd, io.Reader) {
ptmx, err := pty.Start(cmd) ptmx, err := pty.StartWithSize(cmd, gui.desiredPtySize())
if err != nil { if err != nil {
gui.Log.Error(err) gui.Log.Error(err)
} }
@ -67,10 +73,6 @@ func (gui *Gui) newPtyTask(view *gocui.View, cmd *exec.Cmd, prefix string) error
gui.State.Ptmx = nil gui.State.Ptmx = nil
} }
if err := gui.onResize(); err != nil {
return err
}
if err := manager.NewTask(manager.NewCmdTask(start, prefix, height+oy+10, onClose), cmdStr); err != nil { if err := manager.NewTask(manager.NewCmdTask(start, prefix, height+oy+10, onClose), cmdStr); err != nil {
return err return err
} }