Proper help toggle

This commit is contained in:
Zachary Yedidia
2019-01-15 17:10:13 -05:00
parent 538f0117bc
commit df968db5a3
3 changed files with 10 additions and 4 deletions

View File

@@ -1001,13 +1001,17 @@ func (h *BufHandler) ClearStatus() bool {
// ToggleHelp toggles the help screen
func (h *BufHandler) ToggleHelp() bool {
h.openHelp("help")
return true
if h.Buf.Type == buffer.BTHelp {
h.Quit()
} else {
h.openHelp("help")
}
return false
}
// ToggleKeyMenu toggles the keymenu option and resizes all tabs
func (h *BufHandler) ToggleKeyMenu() bool {
return true
return false
}
// ShellMode opens a terminal to run a shell command

View File

@@ -57,6 +57,8 @@ func (v *View) SetView(view *View) {
func (w *BufWindow) Resize(width, height int) {
w.Width, w.Height = width, height
w.lineHeight = make([]int, height)
// This recalculates lineHeight
w.GetMouseLoc(buffer.Loc{width, height})
}
func (w *BufWindow) SetActive(b bool) {

View File

@@ -32,7 +32,7 @@ func NewStatusLine(win *BufWindow) *StatusLine {
s := new(StatusLine)
s.FormatLeft = "$(filename) $(modified)($(line),$(col)) $(opt:filetype) $(opt:fileformat)"
// s.FormatLeft = "$(filename) $(modified)(line,col) $(opt:filetype) $(opt:fileformat)"
s.FormatRight = "$(bind:ToggleKeyMenu): show bindings, $(bind:ToggleHelp): open help"
s.FormatRight = "$(bind:ToggleKeyMenu): show bindings, $(bind:ToggleHelp): toggle help"
s.Info = map[string]func(*buffer.Buffer) string{
"filename": func(b *buffer.Buffer) string {
if b.Settings["basename"].(bool) {