go/lazygit
1
0
Fork 0
mirror of https://github.com/jesseduffield/lazygit.git synced 2025-07-15 01:34:26 +02:00
Code Issues Releases Activity

help panel size from getConfirmationPanelDimensions

Browse Source
This commit is contained in:
Dawid Dziurla
2018-08-30 13:39:11 +02:00
parent 8a01d11202
commit 653d590157
1 changed files with 16 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
pkg/gui/help_panel.go
View File

@ -11,11 +11,14 @@ var keys []Binding
func (gui *Gui) handleHelpPress(g *gocui.Gui, v *gocui.View) error { func (gui *Gui) handleHelpPress(g *gocui.Gui, v *gocui.View) error {
lineNumber := gui.getItemPosition(v) lineNumber := gui.getItemPosition(v)
err := gui.handleHelpClose(g, v) if len(keys) > lineNumber {
if err != nil { err := gui.handleHelpClose(g, v)
return err if err != nil {
return err
}
return keys[lineNumber].Handler(g, v)
} }
return keys[lineNumber].Handler(g, v) return nil
} }
func (gui *Gui) handleHelpSelect(g *gocui.Gui, v *gocui.View) error { func (gui *Gui) handleHelpSelect(g *gocui.Gui, v *gocui.View) error {
@ -49,15 +52,6 @@ func (gui *Gui) handleHelp(g *gocui.Gui, v *gocui.View) error {
keys = keys[:0] keys = keys[:0]
content := "" content := ""
bindings := gui.getKeybindings() bindings := gui.getKeybindings()
maxX, maxY := g.Size()
x := maxX * 3 / 4
y := 5
helpView, _ := g.SetView("help", maxX-x, y, x, maxY-y, 0)
helpView.Title = strings.Title(gui.Tr.SLocalize("help"))
if err := gui.renderHelpOptions(g); err != nil {
return err
}
for _, binding := range bindings { for _, binding := range bindings {
if binding.ViewName == v.Name() && binding.Description != "" && binding.KeyReadable != "" { if binding.ViewName == v.Name() && binding.Description != "" && binding.KeyReadable != "" {
@ -66,6 +60,15 @@ func (gui *Gui) handleHelp(g *gocui.Gui, v *gocui.View) error {
} }
} }
// y1-1 so there will not be an extra space at the end of panel
x0, y0, x1, y1 := gui.getConfirmationPanelDimensions(g, content)
helpView, _ := g.SetView("help", x0, y0, x1, y1-1, 0)
helpView.Title = strings.Title(gui.Tr.SLocalize("help"))
if err := gui.renderHelpOptions(g); err != nil {
return err
}
// for testing // for testing
/*content += "first\n" /*content += "first\n"
content += "second\n" content += "second\n"