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

Zero focusables not a problem anymore

Browse Source
This commit is contained in:
Chris Cummer 2018-04-29 11:57:49 -07:00
parent 55b2490cc9
commit eb9a56ed77
1 changed files with 29 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
wtf/focus_tracker.go
View File

@ -46,7 +46,11 @@ func (tracker *FocusTracker) Prev() {
/* -------------------- Unexported Functions -------------------- */ /* -------------------- Unexported Functions -------------------- */
func (tracker *FocusTracker) blur(idx int) { func (tracker *FocusTracker) blur(idx int) {
view := tracker.focusable()[idx].TextView() view := tracker.focusableAt(idx)
if view == nil {
return
}
view.Blur() view.Blur()
view.SetBorderColor(ColorFor(Config.UString("wtf.colors.border.normal", "gray"))) view.SetBorderColor(ColorFor(Config.UString("wtf.colors.border.normal", "gray")))
} }
@ -55,17 +59,21 @@ func (tracker *FocusTracker) decrement() {
tracker.Idx = tracker.Idx - 1 tracker.Idx = tracker.Idx - 1
if tracker.Idx < 0 { if tracker.Idx < 0 {
tracker.Idx = len(tracker.focusable()) - 1 tracker.Idx = len(tracker.focusables()) - 1
} }
} }
func (tracker *FocusTracker) focus(idx int) { func (tracker *FocusTracker) focus(idx int) {
view := tracker.focusable()[idx].TextView() view := tracker.focusableAt(idx)
if view == nil {
return
}
tracker.App.SetFocus(view) tracker.App.SetFocus(view)
view.SetBorderColor(ColorFor(Config.UString("wtf.colors.border.focus", "gray"))) view.SetBorderColor(ColorFor(Config.UString("wtf.colors.border.focus", "gray")))
} }
func (tracker *FocusTracker) focusable() []TextViewer { func (tracker *FocusTracker) focusables() []TextViewer {
focusable := []TextViewer{} focusable := []TextViewer{}
for _, widget := range tracker.Widgets { for _, widget := range tracker.Widgets {
@ -77,22 +85,30 @@ func (tracker *FocusTracker) focusable() []TextViewer {
return focusable return focusable
} }
func (tracker *FocusTracker) focusableAt(idx int) *tview.TextView {
if idx < 0 || idx >= len(tracker.focusables()) {
return nil
}
return tracker.focusables()[idx].TextView()
}
func (tracker *FocusTracker) increment() { func (tracker *FocusTracker) increment() {
tracker.Idx = tracker.Idx + 1 tracker.Idx = tracker.Idx + 1
if tracker.Idx == len(tracker.focusable()) { if tracker.Idx == len(tracker.focusables()) {
tracker.Idx = 0 tracker.Idx = 0
} }
} }
// widgetHasFocus returns true if one of the widgets currently has the app's focus, // widgetHasFocus returns true if one of the widgets currently has the app's focus,
// false if none of them do (ie: perhaps a modal dialog currently has it instead) // false if none of them do (ie: perhaps a modal dialog currently has it instead)
//func (tracker *FocusTracker) widgetHasFocus() bool { func (tracker *FocusTracker) widgetHasFocus() bool {
//for _, widget := range tracker.Widgets { for _, widget := range tracker.Widgets {
//if widget.TextView() == tracker.App.GetFocus() { if widget.TextView() == tracker.App.GetFocus() {
//return true return true
//} }
//} }
//return false return false
//} }