diff options
| author | evan <evan@evanw.org> | 2018-05-21 11:47:27 -0500 |
|---|---|---|
| committer | evan <evan@evanw.org> | 2018-05-21 11:49:23 -0500 |
| commit | b22ef132b755c6960c74aa980df2cc8e9126b26b (patch) | |
| tree | 8c1518fbe964d32cda398b0a014d0da66f34c4f5 /ui | |
| parent | 8c869b0fd719a7cbbc15c005d899b76466956ab3 (diff) | |
fuzzy finder cleanup
Diffstat (limited to 'ui')
| -rw-r--r-- | ui/fuzzy-view.go | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/ui/fuzzy-view.go b/ui/fuzzy-view.go index 8dd2cf2..d5498d0 100644 --- a/ui/fuzzy-view.go +++ b/ui/fuzzy-view.go @@ -37,12 +37,12 @@ type FuzzyView struct { func NewFuzzyView(view *MainView, width int, height int) *FuzzyView { - rooms := []*rooms.Room{} - roomtitles := []string{} + roomList := []*rooms.Room{} + roomTitles := []string{} for _, tag := range view.roomList.tags { for _, room := range view.roomList.items[tag].rooms { - rooms = append(rooms, room.Room) - roomtitles = append(roomtitles, room.GetTitle()) + roomList = append(roomList, room.Room) + roomTitles = append(roomTitles, room.GetTitle()) } } // search box for fuzzy search @@ -78,7 +78,7 @@ func NewFuzzyView(view *MainView, width int, height int) *FuzzyView { // callback to update search box fuzzySearch.SetChangedFunc(func(str string) { // get matches and display in fuzzyResults - fuzz.matches = fuzzy.RankFindFold(str, roomtitles) + fuzz.matches = fuzzy.RankFindFold(str, roomTitles) if len(str) > 0 && len(fuzz.matches) > 0 { sort.Sort(fuzz.matches) fuzzyResults.Clear() @@ -99,6 +99,7 @@ func NewFuzzyView(view *MainView, width int, height int) *FuzzyView { highlights := fuzzyResults.GetHighlights() if event.Key() == tcell.KeyEsc { view.parent.views.RemovePage("fuzzy") + view.parent.app.SetFocus(view.parent.views) return nil } else if event.Key() == tcell.KeyTab { // cycle highlighted area to next fuzzy match @@ -111,8 +112,8 @@ func NewFuzzyView(view *MainView, width int, height int) *FuzzyView { } else if event.Key() == tcell.KeyEnter { // switch room to currently selected room if len(highlights) > 0 { - debug.Print("Fuzzy Selected Room:", rooms[fuzz.matches[fuzz.selected].Index].GetTitle()) - view.SwitchRoom(rooms[fuzz.matches[fuzz.selected].Index].Tags()[0].Tag, rooms[fuzz.matches[fuzz.selected].Index]) + debug.Print("Fuzzy Selected Room:", roomList[fuzz.matches[fuzz.selected].Index].GetTitle()) + view.SwitchRoom(roomList[fuzz.matches[fuzz.selected].Index].Tags()[0].Tag, roomList[fuzz.matches[fuzz.selected].Index]) } view.parent.views.RemovePage("fuzzy") fuzzyResults.Clear() |