diff options
| author | Jesse Duffield <jessedduffield@gmail.com> | 2019-02-16 12:07:27 +1100 |
|---|---|---|
| committer | Jesse Duffield <jessedduffield@gmail.com> | 2019-02-16 12:07:27 +1100 |
| commit | 198cbee498e9201b1f12514f909eb3da98db5ec7 (patch) | |
| tree | a315ad46dd3b170ce3e9c3a826853affe97d5d93 /pkg/gui/menu_panel.go | |
| parent | daca07eacac8bc5cb7bcf65a762ed5093f2b8a82 (diff) | |
introduce panel contexts and more work on rebasing
Diffstat (limited to 'pkg/gui/menu_panel.go')
| -rw-r--r-- | pkg/gui/menu_panel.go | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/pkg/gui/menu_panel.go b/pkg/gui/menu_panel.go index 4feb416ec..847069446 100644 --- a/pkg/gui/menu_panel.go +++ b/pkg/gui/menu_panel.go @@ -68,9 +68,12 @@ func (gui *Gui) createMenu(title string, items interface{}, handlePress func(int if err := handlePress(selectedLine); err != nil { return err } - if _, err := gui.g.SetViewOnBottom("menu"); err != nil { - return err + if _, err := gui.g.View("menu"); err == nil { + if _, err := gui.g.SetViewOnBottom("menu"); err != nil { + return err + } } + return gui.returnFocus(gui.g, menuView) } @@ -79,8 +82,10 @@ func (gui *Gui) createMenu(title string, items interface{}, handlePress func(int } gui.g.Update(func(g *gocui.Gui) error { - if _, err := g.SetViewOnTop("menu"); err != nil { - return err + if _, err := gui.g.View("menu"); err == nil { + if _, err := g.SetViewOnTop("menu"); err != nil { + return err + } } currentView := gui.g.CurrentView() return gui.switchFocus(gui.g, currentView, menuView) |