diff --git a/pkg/gui/options_map.go b/pkg/gui/options_map.go index 347db7589..bacc3b106 100644 --- a/pkg/gui/options_map.go +++ b/pkg/gui/options_map.go @@ -50,14 +50,9 @@ func (self *OptionsMapMgr) renderContextOptionsMap() { displayStyle = *binding.DisplayStyle } - description := binding.Description - if binding.ShortDescription != "" { - description = binding.ShortDescription - } - return bindingInfo{ key: keybindings.LabelFromKey(binding.Key), - description: description, + description: binding.GetShortDescription(), style: displayStyle, } }) diff --git a/pkg/gui/types/keybindings.go b/pkg/gui/types/keybindings.go index 54e257498..0276500ab 100644 --- a/pkg/gui/types/keybindings.go +++ b/pkg/gui/types/keybindings.go @@ -47,6 +47,13 @@ func (b *Binding) IsDisabled() bool { return b.GetDisabledReason != nil && b.GetDisabledReason() != nil } +func (b *Binding) GetShortDescription() string { + if b.ShortDescription != "" { + return b.ShortDescription + } + return b.Description +} + // A guard is a decorator which checks something before executing a handler // and potentially early-exits if some precondition hasn't been met. type Guard func(func() error) func() error