From f9a06540f1cac4b25b578a1e87f5ffbde4a3cf24 Mon Sep 17 00:00:00 2001 From: Chris Cummer Date: Thu, 26 Nov 2020 14:05:34 -0800 Subject: [PATCH] Simplify the view loading for the keyboard widget Signed-off-by: Chris Cummer --- generator/textwidget.go | 2 -- modules/buildkite/widget.go | 1 - modules/cds/favorites/widget.go | 1 - modules/cds/queue/widget.go | 2 -- modules/cds/status/widget.go | 2 -- modules/datadog/widget.go | 2 -- modules/devto/widget.go | 2 -- modules/digitalocean/widget.go | 1 - modules/feedreader/widget.go | 2 -- modules/gerrit/widget.go | 2 -- modules/git/widget.go | 2 -- modules/github/widget.go | 3 +-- modules/gitlab/widget.go | 2 -- modules/gitlabtodo/widget.go | 2 -- modules/gitter/widget.go | 2 -- modules/grafana/widget.go | 2 -- modules/hackernews/widget.go | 2 -- modules/jenkins/widget.go | 2 -- modules/jira/widget.go | 2 -- modules/mercurial/widget.go | 2 -- modules/nbascore/widget.go | 2 -- modules/newrelic/widget.go | 2 -- modules/pihole/widget.go | 2 -- modules/pocket/widget.go | 1 - modules/rollbar/widget.go | 2 -- modules/security/firewall.go | 1 - modules/spotify/widget.go | 2 -- modules/spotifyweb/widget.go | 2 -- modules/subreddit/widget.go | 2 -- modules/textfile/widget.go | 2 -- modules/todo/widget.go | 1 - modules/todo_plus/widget.go | 2 -- modules/transmission/widget.go | 2 -- modules/travisci/widget.go | 2 -- modules/twitch/widget.go | 1 - modules/twitter/widget.go | 2 -- modules/uptimerobot/widget.go | 2 -- modules/weatherservices/weather/widget.go | 2 -- modules/zendesk/widget.go | 1 - view/bargraph.go | 4 ++-- view/base.go | 4 ++-- view/keyboard_widget.go | 15 +++++++++++++-- view/keyboard_widget_test.go | 12 ++++++------ view/text_widget.go | 8 +++++--- 44 files changed, 29 insertions(+), 85 deletions(-) diff --git a/generator/textwidget.go b/generator/textwidget.go index dabb68e8..65368ebb 100644 --- a/generator/textwidget.go +++ b/generator/textwidget.go @@ -40,8 +40,6 @@ func main() { generateWidgetFile(data) generateSettingsFile(data) - - fmt.Println("Done") } /* -------------------- Unexported Functions -------------------- */ diff --git a/modules/buildkite/widget.go b/modules/buildkite/widget.go index b8ff0462..d018a13b 100644 --- a/modules/buildkite/widget.go +++ b/modules/buildkite/widget.go @@ -23,7 +23,6 @@ func NewWidget(app *tview.Application, pages *tview.Pages, settings *Settings) * widget.initializeKeyboardControls() widget.View.SetScrollable(true) - widget.KeyboardWidget.SetView(widget.View) return &widget } diff --git a/modules/cds/favorites/widget.go b/modules/cds/favorites/widget.go index b9d55d21..4681a968 100644 --- a/modules/cds/favorites/widget.go +++ b/modules/cds/favorites/widget.go @@ -40,7 +40,6 @@ func NewWidget(app *tview.Application, pages *tview.Pages, settings *Settings) * widget.SetDisplayFunction(widget.display) widget.Unselect() - widget.KeyboardWidget.SetView(widget.View) widget.client = cdsclient.New(cdsclient.Config{ Host: settings.apiURL, diff --git a/modules/cds/queue/widget.go b/modules/cds/queue/widget.go index 9433ff55..36543a33 100644 --- a/modules/cds/queue/widget.go +++ b/modules/cds/queue/widget.go @@ -42,8 +42,6 @@ func NewWidget(app *tview.Application, pages *tview.Pages, settings *Settings) * widget.Unselect() widget.filters = []string{sdk.StatusWaiting, sdk.StatusBuilding} - widget.KeyboardWidget.SetView(widget.View) - widget.client = cdsclient.New(cdsclient.Config{ Host: settings.apiURL, BuitinConsumerAuthenticationToken: settings.token, diff --git a/modules/cds/status/widget.go b/modules/cds/status/widget.go index d58b5199..3619adb0 100644 --- a/modules/cds/status/widget.go +++ b/modules/cds/status/widget.go @@ -42,8 +42,6 @@ func NewWidget(app *tview.Application, pages *tview.Pages, settings *Settings) * widget.Unselect() widget.filters = []string{sdk.StatusWaiting, sdk.StatusBuilding} - widget.KeyboardWidget.SetView(widget.View) - widget.client = cdsclient.New(cdsclient.Config{ Host: settings.apiURL, BuitinConsumerAuthenticationToken: settings.token, diff --git a/modules/datadog/widget.go b/modules/datadog/widget.go index e3fe94da..0d88de04 100644 --- a/modules/datadog/widget.go +++ b/modules/datadog/widget.go @@ -27,8 +27,6 @@ func NewWidget(app *tview.Application, pages *tview.Pages, settings *Settings) * widget.SetRenderFunction(widget.Render) widget.initializeKeyboardControls() - widget.KeyboardWidget.SetView(widget.View) - return &widget } diff --git a/modules/devto/widget.go b/modules/devto/widget.go index b532e78d..52d4498f 100644 --- a/modules/devto/widget.go +++ b/modules/devto/widget.go @@ -30,8 +30,6 @@ func NewWidget(app *tview.Application, pages *tview.Pages, settings *Settings) * widget.View.SetScrollable(true) widget.initializeKeyboardControls() - widget.KeyboardWidget.SetView(widget.View) - return widget } diff --git a/modules/digitalocean/widget.go b/modules/digitalocean/widget.go index 3a7df45d..6b2f8680 100644 --- a/modules/digitalocean/widget.go +++ b/modules/digitalocean/widget.go @@ -55,7 +55,6 @@ func NewWidget(app *tview.Application, pages *tview.Pages, settings *Settings) * widget.View.SetScrollable(true) - widget.KeyboardWidget.SetView(widget.View) widget.SetRenderFunction(widget.display) widget.createClient() diff --git a/modules/feedreader/widget.go b/modules/feedreader/widget.go index 77adbf97..9f290ad3 100644 --- a/modules/feedreader/widget.go +++ b/modules/feedreader/widget.go @@ -75,8 +75,6 @@ func NewWidget(app *tview.Application, pages *tview.Pages, settings *Settings) * widget.SetRenderFunction(widget.Render) widget.initializeKeyboardControls() - widget.KeyboardWidget.SetView(widget.View) - return widget } diff --git a/modules/gerrit/widget.go b/modules/gerrit/widget.go index 585e43fa..041795c7 100644 --- a/modules/gerrit/widget.go +++ b/modules/gerrit/widget.go @@ -40,8 +40,6 @@ func NewWidget(app *tview.Application, pages *tview.Pages, settings *Settings) * widget.initializeKeyboardControls() - widget.KeyboardWidget.SetView(widget.View) - widget.unselect() return &widget diff --git a/modules/git/widget.go b/modules/git/widget.go index 80e99bdb..2e9380cc 100644 --- a/modules/git/widget.go +++ b/modules/git/widget.go @@ -42,8 +42,6 @@ func NewWidget(app *tview.Application, pages *tview.Pages, settings *Settings) * widget.SetDisplayFunction(widget.display) - widget.KeyboardWidget.SetView(widget.View) - return &widget } diff --git a/modules/github/widget.go b/modules/github/widget.go index 33ea2a80..78b61d6c 100644 --- a/modules/github/widget.go +++ b/modules/github/widget.go @@ -34,6 +34,7 @@ func NewWidget(app *tview.Application, pages *tview.Pages, settings *Settings) * widget.GithubRepos = widget.buildRepoCollection(widget.settings.repositories) widget.initializeKeyboardControls() + widget.View.SetRegions(true) widget.SetDisplayFunction(widget.display) @@ -41,8 +42,6 @@ func NewWidget(app *tview.Application, pages *tview.Pages, settings *Settings) * widget.Sources = widget.settings.repositories - widget.KeyboardWidget.SetView(widget.View) - return &widget } diff --git a/modules/gitlab/widget.go b/modules/gitlab/widget.go index 27293520..6a1e1da7 100644 --- a/modules/gitlab/widget.go +++ b/modules/gitlab/widget.go @@ -50,8 +50,6 @@ func NewWidget(app *tview.Application, pages *tview.Pages, settings *Settings) * widget.Unselect() - widget.KeyboardWidget.SetView(widget.View) - return &widget } diff --git a/modules/gitlabtodo/widget.go b/modules/gitlabtodo/widget.go index 19555433..b3344077 100644 --- a/modules/gitlabtodo/widget.go +++ b/modules/gitlabtodo/widget.go @@ -30,8 +30,6 @@ func NewWidget(app *tview.Application, pages *tview.Pages, settings *Settings) * widget.SetRenderFunction(widget.Render) widget.initializeKeyboardControls() - widget.KeyboardWidget.SetView(widget.View) - return widget } diff --git a/modules/gitter/widget.go b/modules/gitter/widget.go index 6ab8ac0b..e7ea0ab2 100644 --- a/modules/gitter/widget.go +++ b/modules/gitter/widget.go @@ -27,8 +27,6 @@ func NewWidget(app *tview.Application, pages *tview.Pages, settings *Settings) * widget.SetRenderFunction(widget.Refresh) widget.initializeKeyboardControls() - widget.KeyboardWidget.SetView(widget.View) - return &widget } diff --git a/modules/grafana/widget.go b/modules/grafana/widget.go index 2af2bfbb..8909c496 100644 --- a/modules/grafana/widget.go +++ b/modules/grafana/widget.go @@ -33,8 +33,6 @@ func NewWidget(app *tview.Application, pages *tview.Pages, settings *Settings) * widget.initializeKeyboardControls() widget.View.SetRegions(true) - widget.KeyboardWidget.SetView(widget.View) - return &widget } diff --git a/modules/hackernews/widget.go b/modules/hackernews/widget.go index 4da25c2b..b3f5a486 100644 --- a/modules/hackernews/widget.go +++ b/modules/hackernews/widget.go @@ -28,8 +28,6 @@ func NewWidget(app *tview.Application, pages *tview.Pages, settings *Settings) * widget.SetRenderFunction(widget.Render) widget.initializeKeyboardControls() - widget.KeyboardWidget.SetView(widget.View) - return widget } diff --git a/modules/jenkins/widget.go b/modules/jenkins/widget.go index 36b05a36..54d4bad3 100644 --- a/modules/jenkins/widget.go +++ b/modules/jenkins/widget.go @@ -27,8 +27,6 @@ func NewWidget(app *tview.Application, pages *tview.Pages, settings *Settings) * widget.SetRenderFunction(widget.Render) widget.initializeKeyboardControls() - widget.KeyboardWidget.SetView(widget.View) - return &widget } diff --git a/modules/jira/widget.go b/modules/jira/widget.go index 92c458dc..6a1f0a15 100644 --- a/modules/jira/widget.go +++ b/modules/jira/widget.go @@ -26,8 +26,6 @@ func NewWidget(app *tview.Application, pages *tview.Pages, settings *Settings) * widget.SetRenderFunction(widget.Render) widget.initializeKeyboardControls() - widget.KeyboardWidget.SetView(widget.View) - return &widget } diff --git a/modules/mercurial/widget.go b/modules/mercurial/widget.go index efe7a104..d9db9870 100644 --- a/modules/mercurial/widget.go +++ b/modules/mercurial/widget.go @@ -39,8 +39,6 @@ func NewWidget(app *tview.Application, pages *tview.Pages, settings *Settings) * widget.initializeKeyboardControls() - widget.KeyboardWidget.SetView(widget.View) - return &widget } diff --git a/modules/nbascore/widget.go b/modules/nbascore/widget.go index a38132c8..e0493d81 100644 --- a/modules/nbascore/widget.go +++ b/modules/nbascore/widget.go @@ -35,8 +35,6 @@ func NewWidget(app *tview.Application, pages *tview.Pages, settings *Settings) * widget.View.SetScrollable(true) - widget.KeyboardWidget.SetView(widget.View) - return &widget } diff --git a/modules/newrelic/widget.go b/modules/newrelic/widget.go index 0a748228..a22cfc21 100644 --- a/modules/newrelic/widget.go +++ b/modules/newrelic/widget.go @@ -37,8 +37,6 @@ func NewWidget(app *tview.Application, pages *tview.Pages, settings *Settings) * widget.SetDisplayFunction(widget.Refresh) - widget.KeyboardWidget.SetView(widget.View) - return &widget } diff --git a/modules/pihole/widget.go b/modules/pihole/widget.go index 571f7dd3..38d1c64d 100644 --- a/modules/pihole/widget.go +++ b/modules/pihole/widget.go @@ -28,8 +28,6 @@ func NewWidget(app *tview.Application, pages *tview.Pages, settings *Settings) * widget.View.SetWordWrap(true) widget.View.SetWrap(settings.wrapText) - widget.KeyboardWidget.SetView(widget.View) - return &widget } diff --git a/modules/pocket/widget.go b/modules/pocket/widget.go index 1e2a6959..a790d218 100644 --- a/modules/pocket/widget.go +++ b/modules/pocket/widget.go @@ -33,7 +33,6 @@ func NewWidget(app *tview.Application, pages *tview.Pages, settings *Settings) * widget.SetRenderFunction(widget.Render) widget.View.SetScrollable(true) widget.View.SetRegions(true) - widget.KeyboardWidget.SetView(widget.View) widget.initializeKeyboardControls() widget.Selected = -1 widget.SetItemCount(0) diff --git a/modules/rollbar/widget.go b/modules/rollbar/widget.go index e9894cbe..4915b4ee 100644 --- a/modules/rollbar/widget.go +++ b/modules/rollbar/widget.go @@ -28,8 +28,6 @@ func NewWidget(app *tview.Application, pages *tview.Pages, settings *Settings) * widget.SetRenderFunction(widget.Render) widget.initializeKeyboardControls() - widget.KeyboardWidget.SetView(widget.View) - return &widget } diff --git a/modules/security/firewall.go b/modules/security/firewall.go index 3049a944..0e61ec54 100644 --- a/modules/security/firewall.go +++ b/modules/security/firewall.go @@ -82,7 +82,6 @@ func firewallStateWindows() string { fwStat := utils.ExecuteCommand(cmd) fwStat = strings.TrimSpace(fwStat) // Always sanitize PowerShell output: "3\r\n" - //fmt.Printf("%d %q\n", len(fwStat), fwStat) switch fwStat { case "3": diff --git a/modules/spotify/widget.go b/modules/spotify/widget.go index 71d4afa5..63c0c47f 100644 --- a/modules/spotify/widget.go +++ b/modules/spotify/widget.go @@ -36,8 +36,6 @@ func NewWidget(app *tview.Application, pages *tview.Pages, settings *Settings) * widget.View.SetWrap(true) widget.View.SetWordWrap(true) - widget.KeyboardWidget.SetView(widget.View) - return &widget } diff --git a/modules/spotifyweb/widget.go b/modules/spotifyweb/widget.go index 858987d1..350dfe3b 100644 --- a/modules/spotifyweb/widget.go +++ b/modules/spotifyweb/widget.go @@ -126,8 +126,6 @@ func NewWidget(app *tview.Application, pages *tview.Pages, settings *Settings) * widget.View.SetWrap(true) widget.View.SetWordWrap(true) - widget.KeyboardWidget.SetView(widget.View) - return &widget } diff --git a/modules/subreddit/widget.go b/modules/subreddit/widget.go index b58c0cbe..7bea4e81 100644 --- a/modules/subreddit/widget.go +++ b/modules/subreddit/widget.go @@ -26,8 +26,6 @@ func NewWidget(app *tview.Application, pages *tview.Pages, settings *Settings) * widget.SetRenderFunction(widget.Render) widget.initializeKeyboardControls() - widget.KeyboardWidget.SetView(widget.View) - return widget } diff --git a/modules/textfile/widget.go b/modules/textfile/widget.go index 6204e0b8..597a28c3 100644 --- a/modules/textfile/widget.go +++ b/modules/textfile/widget.go @@ -46,8 +46,6 @@ func NewWidget(app *tview.Application, pages *tview.Pages, settings *Settings) * widget.View.SetWordWrap(true) widget.View.SetWrap(settings.wrapText) - widget.KeyboardWidget.SetView(widget.View) - go widget.watchForFileChanges() return &widget diff --git a/modules/todo/widget.go b/modules/todo/widget.go index 5140127b..24465c94 100644 --- a/modules/todo/widget.go +++ b/modules/todo/widget.go @@ -50,7 +50,6 @@ func NewWidget(app *tview.Application, pages *tview.Pages, settings *Settings) * widget.View.SetRegions(true) widget.View.SetScrollable(true) - widget.KeyboardWidget.SetView(widget.View) widget.SetRenderFunction(widget.display) return &widget diff --git a/modules/todo_plus/widget.go b/modules/todo_plus/widget.go index 20b0a831..36689043 100644 --- a/modules/todo_plus/widget.go +++ b/modules/todo_plus/widget.go @@ -35,8 +35,6 @@ func NewWidget(app *tview.Application, pages *tview.Pages, settings *Settings) * widget.initializeKeyboardControls() widget.SetDisplayFunction(widget.display) - widget.KeyboardWidget.SetView(widget.View) - return &widget } diff --git a/modules/transmission/widget.go b/modules/transmission/widget.go index 7a00f119..c8c8f012 100644 --- a/modules/transmission/widget.go +++ b/modules/transmission/widget.go @@ -31,8 +31,6 @@ func NewWidget(app *tview.Application, pages *tview.Pages, settings *Settings) * widget.SetRenderFunction(widget.display) widget.initializeKeyboardControls() - widget.KeyboardWidget.SetView(widget.View) - go buildClient(&widget) return &widget diff --git a/modules/travisci/widget.go b/modules/travisci/widget.go index ae74d374..71442e2f 100644 --- a/modules/travisci/widget.go +++ b/modules/travisci/widget.go @@ -27,8 +27,6 @@ func NewWidget(app *tview.Application, pages *tview.Pages, settings *Settings) * widget.SetRenderFunction(widget.Render) widget.initializeKeyboardControls() - widget.KeyboardWidget.SetView(widget.View) - return &widget } diff --git a/modules/twitch/widget.go b/modules/twitch/widget.go index 230d8ead..96eb565f 100644 --- a/modules/twitch/widget.go +++ b/modules/twitch/widget.go @@ -36,7 +36,6 @@ func NewWidget(app *tview.Application, pages *tview.Pages, settings *Settings) * widget.SetRenderFunction(widget.Render) widget.initializeKeyboardControls() - widget.KeyboardWidget.SetView(widget.View) return widget } diff --git a/modules/twitter/widget.go b/modules/twitter/widget.go index 232a7408..864ab5f8 100644 --- a/modules/twitter/widget.go +++ b/modules/twitter/widget.go @@ -39,8 +39,6 @@ func NewWidget(app *tview.Application, pages *tview.Pages, settings *Settings) * widget.View.SetWrap(true) widget.View.SetWordWrap(true) - widget.KeyboardWidget.SetView(widget.View) - return &widget } diff --git a/modules/uptimerobot/widget.go b/modules/uptimerobot/widget.go index bb773265..5ee16b3f 100644 --- a/modules/uptimerobot/widget.go +++ b/modules/uptimerobot/widget.go @@ -31,8 +31,6 @@ func NewWidget(app *tview.Application, pages *tview.Pages, settings *Settings) * widget.SetRenderFunction(widget.Render) widget.initializeKeyboardControls() - widget.KeyboardWidget.SetView(widget.View) - return widget } diff --git a/modules/weatherservices/weather/widget.go b/modules/weatherservices/weather/widget.go index cfad69f5..aad44b7d 100644 --- a/modules/weatherservices/weather/widget.go +++ b/modules/weatherservices/weather/widget.go @@ -33,8 +33,6 @@ func NewWidget(app *tview.Application, pages *tview.Pages, settings *Settings) * widget.SetDisplayFunction(widget.display) - widget.KeyboardWidget.SetView(widget.View) - return &widget } diff --git a/modules/zendesk/widget.go b/modules/zendesk/widget.go index d523e249..f69f5160 100644 --- a/modules/zendesk/widget.go +++ b/modules/zendesk/widget.go @@ -28,7 +28,6 @@ func NewWidget(app *tview.Application, pages *tview.Pages, settings *Settings) * widget.SetRenderFunction(widget.Render) widget.initializeKeyboardControls() - widget.KeyboardWidget.SetView(widget.View) return &widget } diff --git a/view/bargraph.go b/view/bargraph.go index e4878d6b..49df2431 100644 --- a/view/bargraph.go +++ b/view/bargraph.go @@ -15,8 +15,8 @@ type BarGraph struct { maxStars int starChar string - Base - KeyboardWidget + *Base + *KeyboardWidget View *tview.TextView } diff --git a/view/base.go b/view/base.go index a0585040..919c557c 100644 --- a/view/base.go +++ b/view/base.go @@ -25,8 +25,8 @@ type Base struct { // NewBase creates and returns an instance of the Base module, the lowest-level // primitive module from which all others are derived -func NewBase(app *tview.Application, commonSettings *cfg.Common) Base { - base := Base{ +func NewBase(app *tview.Application, commonSettings *cfg.Common) *Base { + base := &Base{ commonSettings: commonSettings, app: app, diff --git a/view/keyboard_widget.go b/view/keyboard_widget.go index 9e5efc76..a56b6ee1 100644 --- a/view/keyboard_widget.go +++ b/view/keyboard_widget.go @@ -32,8 +32,8 @@ type KeyboardWidget struct { } // NewKeyboardWidget creates and returns a new instance of KeyboardWidget -func NewKeyboardWidget(app *tview.Application, pages *tview.Pages, settings *cfg.Common) KeyboardWidget { - keyWidget := KeyboardWidget{ +func NewKeyboardWidget(app *tview.Application, pages *tview.Pages, settings *cfg.Common) *KeyboardWidget { + keyWidget := &KeyboardWidget{ app: app, pages: pages, settings: settings, @@ -50,6 +50,17 @@ func NewKeyboardWidget(app *tview.Application, pages *tview.Pages, settings *cfg /* -------------------- Exported Functions --------------------- */ +// AssignedChars returns a list of all the text characters assigned to an operation +func (widget *KeyboardWidget) AssignedChars() []string { + chars := []string{} + + for char := range widget.charMap { + chars = append(chars, char) + } + + return chars +} + // HelpText returns the help text and keyboard command info for this widget func (widget *KeyboardWidget) HelpText() string { str := " [green::b]Keyboard commands for " + strings.Title(widget.settings.Module.Type) + "[white]\n\n" diff --git a/view/keyboard_widget_test.go b/view/keyboard_widget_test.go index a56967a4..3ecdb1c9 100644 --- a/view/keyboard_widget_test.go +++ b/view/keyboard_widget_test.go @@ -11,7 +11,7 @@ import ( func test() {} -func testKeyboardWidget() KeyboardWidget { +func testKeyboardWidget() *KeyboardWidget { keyWid := NewKeyboardWidget( tview.NewApplication(), tview.NewPages(), @@ -118,25 +118,25 @@ func Test_SetKeyboardKey(t *testing.T) { func Test_InputCapture(t *testing.T) { tests := []struct { name string - before func(keyWid KeyboardWidget) KeyboardWidget + before func(keyWid *KeyboardWidget) *KeyboardWidget event *tcell.EventKey expected *tcell.EventKey }{ { name: "with nil event", - before: func(keyWid KeyboardWidget) KeyboardWidget { return keyWid }, + before: func(keyWid *KeyboardWidget) *KeyboardWidget { return keyWid }, event: nil, expected: nil, }, { name: "with undefined event", - before: func(keyWid KeyboardWidget) KeyboardWidget { return keyWid }, + before: func(keyWid *KeyboardWidget) *KeyboardWidget { return keyWid }, event: tcell.NewEventKey(tcell.KeyRune, 'a', tcell.ModNone), expected: tcell.NewEventKey(tcell.KeyRune, 'a', tcell.ModNone), }, { name: "with defined event and char handler", - before: func(keyWid KeyboardWidget) KeyboardWidget { + before: func(keyWid *KeyboardWidget) *KeyboardWidget { keyWid.SetKeyboardChar("a", test, "help") return keyWid }, @@ -145,7 +145,7 @@ func Test_InputCapture(t *testing.T) { }, { name: "with defined event and key handler", - before: func(keyWid KeyboardWidget) KeyboardWidget { + before: func(keyWid *KeyboardWidget) *KeyboardWidget { keyWid.SetKeyboardKey(tcell.KeyRune, test, "help") return keyWid }, diff --git a/view/text_widget.go b/view/text_widget.go index 26197593..2414e5b2 100644 --- a/view/text_widget.go +++ b/view/text_widget.go @@ -10,8 +10,8 @@ import ( // TextWidget defines the data necessary to make a text widget type TextWidget struct { - Base - KeyboardWidget + *Base + *KeyboardWidget View *tview.TextView } @@ -24,7 +24,9 @@ func NewTextWidget(app *tview.Application, pages *tview.Pages, commonSettings *c } widget.View = widget.createView(widget.bordered) - widget.View.SetInputCapture(widget.InputCapture) + widget.View.SetInputCapture(widget.KeyboardWidget.InputCapture) + + widget.KeyboardWidget.SetView(widget.View) return widget }