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 branch 'master' into patch-1

Browse Source
This commit is contained in:
Chris Cummer 2018-10-17 19:04:41 -07:00 committed by GitHub
commit aa5389c820
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 26 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
wtf/focus_tracker.go
View File

@ -29,9 +29,25 @@ func (tracker *FocusTracker) AssignHotKeys() {
return return
} }
usedKeys := make(map[string]bool)
focusables := tracker.focusables()
i := 1 i := 1
for _, focusable := range tracker.focusables() { for _, focusable := range focusables {
if focusable.FocusChar() != "" {
usedKeys[focusable.FocusChar()] = true
}
}
for _, focusable := range focusables {
if focusable.FocusChar() != "" {
continue
}
if _, foundKey := usedKeys[string('0'+i)]; foundKey {
for ; foundKey; _, foundKey = usedKeys[string('0'+i)] {
i++
}
}
// Don't have nav characters > "9" // Don't have nav characters > "9"
if i >= 10 { if i >= 10 {
break break

8
wtf/text_widget.go
View File

@ -22,10 +22,16 @@ type TextWidget struct {
} }
func NewTextWidget(app *tview.Application, name string, configKey string, focusable bool) TextWidget { func NewTextWidget(app *tview.Application, name string, configKey string, focusable bool) TextWidget {
focusCharValue := Config.UInt(fmt.Sprintf("wtf.mods.%s.focusChar", configKey), -1)
focusChar := string('0' + focusCharValue)
if focusCharValue == -1 {
focusChar = ""
}
widget := TextWidget{ widget := TextWidget{
enabled: Config.UBool(fmt.Sprintf("wtf.mods.%s.enabled", configKey), false), enabled: Config.UBool(fmt.Sprintf("wtf.mods.%s.enabled", configKey), false),
focusable: focusable, focusable: focusable,
focusChar: focusChar,
Name: Config.UString(fmt.Sprintf("wtf.mods.%s.title", configKey), name), Name: Config.UString(fmt.Sprintf("wtf.mods.%s.title", configKey), name),
RefreshInt: Config.UInt(fmt.Sprintf("wtf.mods.%s.refreshInterval", configKey)), RefreshInt: Config.UInt(fmt.Sprintf("wtf.mods.%s.refreshInterval", configKey)),
} }