diff --git a/main.go b/main.go index 73f6ba4d..7145d73b 100644 --- a/main.go +++ b/main.go @@ -59,7 +59,6 @@ func keyboardIntercept(event *tcell.EventKey) *tcell.EventKey { if !focusTracker.IsFocused { switch string(event.Rune()) { case "/": - fmt.Println(">> OUCH") return nil } } diff --git a/wtf/billboard_modal.go b/wtf/billboard_modal.go index 6a80fd28..e10906c4 100644 --- a/wtf/billboard_modal.go +++ b/wtf/billboard_modal.go @@ -28,9 +28,10 @@ func NewBillboardModal(text string, closeFunc func()) *tview.Frame { } textView := tview.NewTextView() + textView.SetDynamicColors(true) textView.SetInputCapture(keyboardIntercept) - textView.SetWrap(true) textView.SetText(text) + textView.SetWrap(true) frame := tview.NewFrame(textView) frame.SetRect(offscreen, offscreen, modalWidth, modalHeight) diff --git a/wtf/keyboard_widget.go b/wtf/keyboard_widget.go index 317d60fb..8f83aba4 100644 --- a/wtf/keyboard_widget.go +++ b/wtf/keyboard_widget.go @@ -2,6 +2,7 @@ package wtf import ( "fmt" + "strings" "github.com/gdamore/tcell" "github.com/rivo/tview" @@ -85,16 +86,15 @@ func (widget *KeyboardWidget) InputCapture(event *tcell.EventKey) *tcell.EventKe } func (widget *KeyboardWidget) HelpText() string { - - str := "Keyboard commands for " + widget.settings.Module.Type + "\n\n" + str := " [green::b]Keyboard commands for " + strings.Title(widget.settings.Module.Type) + "[white]\n\n" for _, item := range widget.charHelp { - str += fmt.Sprintf(" [%s]: %s\n", item.Key, item.Text) + str += fmt.Sprintf(" %s\t%s\n", item.Key, item.Text) } str += "\n\n" for _, item := range widget.keyHelp { - str += fmt.Sprintf(" [%-*s]: %s\n", widget.maxKey, item.Key, item.Text) + str += fmt.Sprintf(" %-*s\t%s\n", widget.maxKey, item.Key, item.Text) } return str