go/lazygit
1
0
Fork 0
mirror of https://github.com/jesseduffield/lazygit.git synced 2025-01-06 03:53:59 +02:00
Code Issues Releases Activity

fix bug where searching through view got stuck if you went over the upper bound

Browse Source
This commit is contained in:
Jesse Duffield 2021-04-05 00:53:34 +10:00
parent b6cc1c9492
commit 952c62df37
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkg/gui/context.go
View File

@ -665,18 +665,18 @@ func (gui *Gui) onViewFocusChange() error {
return nil return nil
} }
func (gui *Gui) onViewFocusLost(v *gocui.View, newView *gocui.View) error { func (gui *Gui) onViewFocusLost(oldView *gocui.View, newView *gocui.View) error {
if v == nil { if oldView == nil {
return nil return nil
} }
if v.IsSearching() && newView.Name() != "search" { if oldView.IsSearching() && newView != gui.Views.Search {
if err := gui.onSearchEscape(); err != nil { if err := gui.onSearchEscape(); err != nil {
return err return err
} }
} }
if v.Name() == "commitFiles" && newView.Name() != "main" && newView.Name() != "secondary" { if oldView == gui.Views.CommitFiles && newView != gui.Views.Main && newView != gui.Views.Secondary && newView != gui.Views.Search {
gui.resetWindowForView("commitFiles") gui.resetWindowForView("commitFiles")
if err := gui.deactivateContext(gui.State.Contexts.CommitFiles); err != nil { if err := gui.deactivateContext(gui.State.Contexts.CommitFiles); err != nil {
return err return err

2
vendor/github.com/jesseduffield/gocui/view.go generated vendored
View File

@ -170,7 +170,7 @@ func (v *View) gotoNextMatch() error {
if len(v.searcher.searchPositions) == 0 { if len(v.searcher.searchPositions) == 0 {
return nil return nil
} }
if v.searcher.currentSearchIndex == len(v.searcher.searchPositions)-1 { if v.searcher.currentSearchIndex >= len(v.searcher.searchPositions)-1 {
v.searcher.currentSearchIndex = 0 v.searcher.currentSearchIndex = 0
} else { } else {
v.searcher.currentSearchIndex++ v.searcher.currentSearchIndex++