diff options
author | Alex Goodman <wagoodman@gmail.com> | 2019-09-06 07:54:11 -0400 |
---|---|---|
committer | Alex Goodman <wagoodman@gmail.com> | 2019-09-06 07:54:26 -0400 |
commit | 627e6c5f3e28a6582a8bacd90295dd227ad53d2c (patch) | |
tree | 47fd08c0ef0f574f0d2742758b49093c4a5b5f51 | |
parent | d54de9458c869a5a8c83abb7eef8bb7470531852 (diff) |
reset filter cursor only when visible, addresses #225
-rw-r--r-- | ui/filter_controller.go | 1 | ||||
-rw-r--r-- | ui/ui.go | 18 |
2 files changed, 11 insertions, 8 deletions
diff --git a/ui/filter_controller.go b/ui/filter_controller.go index 2b5ea42..7902052 100644 --- a/ui/filter_controller.go +++ b/ui/filter_controller.go @@ -2,7 +2,6 @@ package ui import ( "fmt" - "github.com/jroimartin/gocui" ) @@ -88,10 +88,6 @@ func toggleView(g *gocui.Gui, v *gocui.View) (err error) { func toggleFilterView(g *gocui.Gui, v *gocui.View) error { // delete all user input from the tree view Controllers.Filter.view.Clear() - err := Controllers.Filter.view.SetCursor(0, 0) - if err != nil { - return err - } // toggle hiding Controllers.Filter.hidden = !Controllers.Filter.hidden @@ -104,7 +100,15 @@ func toggleFilterView(g *gocui.Gui, v *gocui.View) error { Update() Render() } else { - return toggleView(g, v) + err := toggleView(g, v) + if err != nil { + return err + } + + err = Controllers.Filter.view.SetCursor(0, 0) + if err != nil { + return err + } } return nil @@ -381,11 +385,11 @@ func Run(analysis *image.AnalysisResult, cache filetree.TreeCache) { Render() if err := keyBindings(g); err != nil { - logrus.Error(err) + logrus.Error("keybinding error: ", err) } if err := g.MainLoop(); err != nil && err != gocui.ErrQuit { - logrus.Error(err) + logrus.Error("main loop error: ", err) } utils.Exit(0) } |