diff options
| author | Jesse Duffield <jessedduffield@gmail.com> | 2020-02-24 22:15:10 +1100 |
|---|---|---|
| committer | Jesse Duffield <jessedduffield@gmail.com> | 2020-02-24 22:18:04 +1100 |
| commit | 78b62be96f2476c19713622c5fc5aab794557d6c (patch) | |
| tree | e189f3597145383e5a9429f498bde72fc96bb6e7 /pkg/gui | |
| parent | 1f5ccab1ce59d82c69645da8ab31da2cee832cd7 (diff) | |
better handling of clearing the search
Diffstat (limited to 'pkg/gui')
| -rw-r--r-- | pkg/gui/branches_panel.go | 2 | ||||
| -rw-r--r-- | pkg/gui/commits_panel.go | 2 | ||||
| -rw-r--r-- | pkg/gui/gui.go | 3 | ||||
| -rw-r--r-- | pkg/gui/searching.go | 10 |
4 files changed, 9 insertions, 8 deletions
diff --git a/pkg/gui/branches_panel.go b/pkg/gui/branches_panel.go index 251b112d8..5ecb563f2 100644 --- a/pkg/gui/branches_panel.go +++ b/pkg/gui/branches_panel.go @@ -400,7 +400,7 @@ func (gui *Gui) onBranchesTabClick(tabIndex int) error { func (gui *Gui) switchBranchesPanelContext(context string) error { branchesView := gui.getBranchesView() branchesView.Context = context - branchesView.ClearSearch() + gui.onSearchEscape() contextTabIndexMap := map[string]int{ "local-branches": 0, diff --git a/pkg/gui/commits_panel.go b/pkg/gui/commits_panel.go index cc95fd82c..b84401e79 100644 --- a/pkg/gui/commits_panel.go +++ b/pkg/gui/commits_panel.go @@ -623,7 +623,7 @@ func (gui *Gui) onCommitsTabClick(tabIndex int) error { func (gui *Gui) switchCommitsPanelContext(context string) error { commitsView := gui.getCommitsView() commitsView.Context = context - commitsView.ClearSearch() + gui.onSearchEscape() contextTabIndexMap := map[string]int{ "branch-commits": 0, diff --git a/pkg/gui/gui.go b/pkg/gui/gui.go index 015e3ebfe..0090e6c92 100644 --- a/pkg/gui/gui.go +++ b/pkg/gui/gui.go @@ -346,8 +346,7 @@ func (gui *Gui) onFocusLost(v *gocui.View, newView *gocui.View) error { return nil } if v.IsSearching() && newView.Name() != "search" { - gui.State.Searching.isSearching = false - v.ClearSearch() + gui.onSearchEscape() } switch v.Name() { case "branches": diff --git a/pkg/gui/searching.go b/pkg/gui/searching.go index 6e8cd2f64..a4fd191b0 100644 --- a/pkg/gui/searching.go +++ b/pkg/gui/searching.go @@ -72,7 +72,11 @@ func (gui *Gui) onSelectItemWrapper(innerFunc func(int) error) func(int, int, in func (gui *Gui) onSearchEscape() error { gui.State.Searching.isSearching = false - gui.State.Searching.view = nil + if gui.State.Searching.view != nil { + gui.State.Searching.view.ClearSearch() + gui.State.Searching.view = nil + } + return nil } @@ -81,9 +85,7 @@ func (gui *Gui) handleSearchEscape(g *gocui.Gui, v *gocui.View) error { return err } - if err := gui.onSearchEscape(); err != nil { - return err - } + gui.onSearchEscape() return nil } |