From 4c73d070acba00f4b4ddd5b76b405f7e3a6f98fe Mon Sep 17 00:00:00 2001 From: Jesse Duffield Date: Mon, 5 Apr 2021 14:12:39 +1000 Subject: [PATCH] ignore clicks on invisible views --- vendor/github.com/jesseduffield/gocui/gui.go | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/vendor/github.com/jesseduffield/gocui/gui.go b/vendor/github.com/jesseduffield/gocui/gui.go index deeb4371a..f16111165 100644 --- a/vendor/github.com/jesseduffield/gocui/gui.go +++ b/vendor/github.com/jesseduffield/gocui/gui.go @@ -347,15 +347,20 @@ func (g *Gui) View(name string) (*View, error) { return nil, errors.Wrap(ErrUnknownView, 0) } -// ViewByPosition returns a pointer to a view matching the given position, or +// VisibleViewByPosition returns a pointer to a view matching the given position, or // error ErrUnknownView if a view in that position does not exist. -func (g *Gui) ViewByPosition(x, y int) (*View, error) { +func (g *Gui) VisibleViewByPosition(x, y int) (*View, error) { g.Mutexes.ViewsMutex.Lock() defer g.Mutexes.ViewsMutex.Unlock() // traverse views in reverse order checking top views first for i := len(g.views); i > 0; i-- { v := g.views[i-1] + + if !v.Visible { + continue + } + frameOffset := 0 if v.Frame { frameOffset = 1 @@ -1042,7 +1047,7 @@ func (g *Gui) onKey(ev *GocuiEvent) error { case eventMouse: mx, my := ev.MouseX, ev.MouseY - v, err := g.ViewByPosition(mx, my) + v, err := g.VisibleViewByPosition(mx, my) if err != nil { break }