summaryrefslogtreecommitdiffstats
path: root/pkg/gui/menu_panel.go
diff options
context:
space:
mode:
authorJesse Duffield <jessedduffield@gmail.com>2020-02-14 23:39:02 +1100
committerJesse Duffield <jessedduffield@gmail.com>2020-02-15 08:47:36 +1100
commit5b9996b16fcec17b3e0e8725ad91828e2d2e7961 (patch)
tree9a02a1fd2f5845aa55f9cfee6c0e70afa0724a75 /pkg/gui/menu_panel.go
parent6fdc1791e4197a4149e80323c72ea00d6317bd74 (diff)
remove old createMenu function
Diffstat (limited to 'pkg/gui/menu_panel.go')
-rw-r--r--pkg/gui/menu_panel.go54
1 files changed, 1 insertions, 53 deletions
diff --git a/pkg/gui/menu_panel.go b/pkg/gui/menu_panel.go
index 8f368ce92..335b298b3 100644
--- a/pkg/gui/menu_panel.go
+++ b/pkg/gui/menu_panel.go
@@ -48,7 +48,7 @@ type createMenuOptions struct {
showCancel bool
}
-func (gui *Gui) createMenuNew(title string, items []*menuItem, createMenuOptions createMenuOptions) error {
+func (gui *Gui) createMenu(title string, items []*menuItem, createMenuOptions createMenuOptions) error {
if createMenuOptions.showCancel {
// this is mutative but I'm okay with that for now
items = append(items, &menuItem{
@@ -116,55 +116,3 @@ func (gui *Gui) createMenuNew(title string, items []*menuItem, createMenuOptions
})
return nil
}
-
-func (gui *Gui) createMenu(title string, items interface{}, itemCount int, handlePress func(int) error) error {
- isFocused := gui.g.CurrentView().Name() == "menu"
- gui.State.MenuItemCount = itemCount
- list, err := utils.RenderList(items, isFocused)
- if err != nil {
- return err
- }
-
- x0, y0, x1, y1 := gui.getConfirmationPanelDimensions(gui.g, false, list)
- menuView, _ := gui.g.SetView("menu", x0, y0, x1, y1, 0)
- menuView.Title = title
- menuView.FgColor = theme.GocuiDefaultTextColor
- menuView.Clear()
- fmt.Fprint(menuView, list)
- gui.State.Panels.Menu.SelectedLine = 0
-
- wrappedHandlePress := func(g *gocui.Gui, v *gocui.View) error {
- selectedLine := gui.State.Panels.Menu.SelectedLine
- if err := handlePress(selectedLine); 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)
- }
-
- gui.State.Panels.Menu.OnPress = wrappedHandlePress
-
- for _, key := range []gocui.Key{gocui.KeySpace, gocui.KeyEnter, 'y'} {
- _ = gui.g.DeleteKeybinding("menu", key, gocui.ModNone)
-
- if err := gui.g.SetKeybinding("menu", nil, key, gocui.ModNone, wrappedHandlePress); err != nil {
- return err
- }
- }
-
- gui.g.Update(func(g *gocui.Gui) error {
- 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)
- })
- return nil
-}