taigrr/wtf
1
0
Fork 0
mirror of https://github.com/taigrr/wtf synced 2025-01-18 04:03:14 -08:00
Code Issues Projects Releases Wiki Activity

Merge pull request #523 from Seanstoppable/fixkeyboardfallthrough

Browse Source 
Fix keyboard fallthrough
This commit is contained in:
Chris Cummer 2019-08-03 19:38:06 -07:00 committed by GitHub
commit c55b542204
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/wtf_app.go
View File

@ -38,6 +38,7 @@ func NewWtfApp(app *tview.Application, config *config.Config, configFilePath str
pages: tview.NewPages(), pages: tview.NewPages(),
} }
wtfApp.app.SetInputCapture(wtfApp.keyboardIntercept)
wtfApp.widgets = maker.MakeWidgets(wtfApp.app, wtfApp.pages, wtfApp.config) wtfApp.widgets = maker.MakeWidgets(wtfApp.app, wtfApp.pages, wtfApp.config)
wtfApp.display = NewDisplay(wtfApp.widgets, wtfApp.config) wtfApp.display = NewDisplay(wtfApp.widgets, wtfApp.config)
wtfApp.focusTracker = NewFocusTracker(wtfApp.app, wtfApp.widgets, wtfApp.config) wtfApp.focusTracker = NewFocusTracker(wtfApp.app, wtfApp.widgets, wtfApp.config)
@ -45,7 +46,6 @@ func NewWtfApp(app *tview.Application, config *config.Config, configFilePath str
wtfApp.pages.AddPage("grid", wtfApp.display.Grid, true, true) wtfApp.pages.AddPage("grid", wtfApp.display.Grid, true, true)
wtfApp.app.SetRoot(wtfApp.pages, true) wtfApp.app.SetRoot(wtfApp.pages, true)
wtfApp.app.SetInputCapture(wtfApp.keyboardIntercept)
wtfApp.validator.Validate(wtfApp.widgets) wtfApp.validator.Validate(wtfApp.widgets)
@ -86,13 +86,11 @@ func (wtfApp *WtfApp) keyboardIntercept(event *tcell.EventKey) *tcell.EventKey {
return nil return nil
case tcell.KeyTab: case tcell.KeyTab:
wtfApp.focusTracker.Next() wtfApp.focusTracker.Next()
return nil
case tcell.KeyBacktab: case tcell.KeyBacktab:
wtfApp.focusTracker.Prev() wtfApp.focusTracker.Prev()
return nil return nil
case tcell.KeyEsc: case tcell.KeyEsc:
wtfApp.focusTracker.None() wtfApp.focusTracker.None()
return nil
} }
// Checks to see if any widget has been assigned the pressed key as its focus key // Checks to see if any widget has been assigned the pressed key as its focus key