From 653d590157886b1fdefd91eafa25c063f7b6b66e Mon Sep 17 00:00:00 2001
From: Dawid Dziurla <dawidd0811@gmail.com>
Date: Thu, 30 Aug 2018 13:39:11 +0200
Subject: [PATCH] help panel size from getConfirmationPanelDimensions

---
 pkg/gui/help_panel.go | 29 ++++++++++++++++-------------
 1 file changed, 16 insertions(+), 13 deletions(-)

diff --git a/pkg/gui/help_panel.go b/pkg/gui/help_panel.go
index 4b3355c46..81cc712b5 100644
--- a/pkg/gui/help_panel.go
+++ b/pkg/gui/help_panel.go
@@ -11,11 +11,14 @@ var keys []Binding
 
 func (gui *Gui) handleHelpPress(g *gocui.Gui, v *gocui.View) error {
 	lineNumber := gui.getItemPosition(v)
-	err := gui.handleHelpClose(g, v)
-	if err != nil {
-		return err
+	if len(keys) > lineNumber {
+		err := gui.handleHelpClose(g, v)
+		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 {
@@ -49,15 +52,6 @@ func (gui *Gui) handleHelp(g *gocui.Gui, v *gocui.View) error {
 	keys = keys[:0]
 	content := ""
 	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 {
 		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
 	/*content += "first\n"
 	content += "second\n"