diff options
author | Jesse Duffield <jessedduffield@gmail.com> | 2020-02-14 23:39:02 +1100 |
---|---|---|
committer | Jesse Duffield <jessedduffield@gmail.com> | 2020-02-15 08:47:36 +1100 |
commit | 5b9996b16fcec17b3e0e8725ad91828e2d2e7961 (patch) | |
tree | 9a02a1fd2f5845aa55f9cfee6c0e70afa0724a75 /pkg | |
parent | 6fdc1791e4197a4149e80323c72ea00d6317bd74 (diff) |
remove old createMenu function
Diffstat (limited to 'pkg')
-rw-r--r-- | pkg/gui/commit_reset_menu_panel.go | 2 | ||||
-rw-r--r-- | pkg/gui/discard_changes_menu_panel.go | 2 | ||||
-rw-r--r-- | pkg/gui/files_panel.go | 2 | ||||
-rw-r--r-- | pkg/gui/git_flow.go | 2 | ||||
-rw-r--r-- | pkg/gui/menu_panel.go | 54 | ||||
-rw-r--r-- | pkg/gui/options_menu_panel.go | 2 | ||||
-rw-r--r-- | pkg/gui/patch_options_panel.go | 2 | ||||
-rw-r--r-- | pkg/gui/rebase_options_panel.go | 2 | ||||
-rw-r--r-- | pkg/gui/recent_repos_panel.go | 2 | ||||
-rw-r--r-- | pkg/gui/reflog_reset_options_panel.go | 2 | ||||
-rw-r--r-- | pkg/gui/workspace_reset_options_panel.go | 2 |
11 files changed, 11 insertions, 63 deletions
diff --git a/pkg/gui/commit_reset_menu_panel.go b/pkg/gui/commit_reset_menu_panel.go index 0ceea51bd..8e9da1aad 100644 --- a/pkg/gui/commit_reset_menu_panel.go +++ b/pkg/gui/commit_reset_menu_panel.go @@ -45,5 +45,5 @@ func (gui *Gui) handleCreateCommitResetMenu(g *gocui.Gui, v *gocui.View) error { } } - return gui.createMenuNew(fmt.Sprintf("%s %s", gui.Tr.SLocalize("resetTo"), commit.Sha), menuItems, createMenuOptions{showCancel: true}) + return gui.createMenu(fmt.Sprintf("%s %s", gui.Tr.SLocalize("resetTo"), commit.Sha), menuItems, createMenuOptions{showCancel: true}) } diff --git a/pkg/gui/discard_changes_menu_panel.go b/pkg/gui/discard_changes_menu_panel.go index 01b2426aa..761551a6a 100644 --- a/pkg/gui/discard_changes_menu_panel.go +++ b/pkg/gui/discard_changes_menu_panel.go @@ -38,5 +38,5 @@ func (gui *Gui) handleCreateDiscardMenu(g *gocui.Gui, v *gocui.View) error { }) } - return gui.createMenuNew(file.Name, menuItems, createMenuOptions{showCancel: true}) + return gui.createMenu(file.Name, menuItems, createMenuOptions{showCancel: true}) } diff --git a/pkg/gui/files_panel.go b/pkg/gui/files_panel.go index a92561a50..df6481f50 100644 --- a/pkg/gui/files_panel.go +++ b/pkg/gui/files_panel.go @@ -564,7 +564,7 @@ func (gui *Gui) handleCreateStashMenu(g *gocui.Gui, v *gocui.View) error { }, } - return gui.createMenuNew(gui.Tr.SLocalize("stashOptions"), menuItems, createMenuOptions{showCancel: true}) + return gui.createMenu(gui.Tr.SLocalize("stashOptions"), menuItems, createMenuOptions{showCancel: true}) } func (gui *Gui) handleStashChanges(g *gocui.Gui, v *gocui.View) error { diff --git a/pkg/gui/git_flow.go b/pkg/gui/git_flow.go index 8876a064c..f265c9ccd 100644 --- a/pkg/gui/git_flow.go +++ b/pkg/gui/git_flow.go @@ -82,5 +82,5 @@ func (gui *Gui) handleCreateGitFlowMenu(g *gocui.Gui, v *gocui.View) error { }, } - return gui.createMenuNew("git flow", menuItems, createMenuOptions{}) + return gui.createMenu("git flow", menuItems, createMenuOptions{}) } 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 -} diff --git a/pkg/gui/options_menu_panel.go b/pkg/gui/options_menu_panel.go index 934da00c6..e7f9da36f 100644 --- a/pkg/gui/options_menu_panel.go +++ b/pkg/gui/options_menu_panel.go @@ -54,5 +54,5 @@ func (gui *Gui) handleCreateOptionsMenu(g *gocui.Gui, v *gocui.View) error { } } - return gui.createMenuNew(strings.Title(gui.Tr.SLocalize("menu")), menuItems, createMenuOptions{}) + return gui.createMenu(strings.Title(gui.Tr.SLocalize("menu")), menuItems, createMenuOptions{}) } diff --git a/pkg/gui/patch_options_panel.go b/pkg/gui/patch_options_panel.go index 68c6a0355..5429ec2e8 100644 --- a/pkg/gui/patch_options_panel.go +++ b/pkg/gui/patch_options_panel.go @@ -52,7 +52,7 @@ func (gui *Gui) handleCreatePatchOptionsMenu(g *gocui.Gui, v *gocui.View) error ) } - return gui.createMenuNew(gui.Tr.SLocalize("PatchOptionsTitle"), menuItems, createMenuOptions{showCancel: true}) + return gui.createMenu(gui.Tr.SLocalize("PatchOptionsTitle"), menuItems, createMenuOptions{showCancel: true}) } func (gui *Gui) getPatchCommitIndex() int { diff --git a/pkg/gui/rebase_options_panel.go b/pkg/gui/rebase_options_panel.go index 7ba3f45ab..f1e87b235 100644 --- a/pkg/gui/rebase_options_panel.go +++ b/pkg/gui/rebase_options_panel.go @@ -31,7 +31,7 @@ func (gui *Gui) handleCreateRebaseOptionsMenu(g *gocui.Gui, v *gocui.View) error title = gui.Tr.SLocalize("RebaseOptionsTitle") } - return gui.createMenuNew(title, menuItems, createMenuOptions{showCancel: true}) + return gui.createMenu(title, menuItems, createMenuOptions{showCancel: true}) } func (gui *Gui) genericMergeCommand(command string) error { diff --git a/pkg/gui/recent_repos_panel.go b/pkg/gui/recent_repos_panel.go index c7da2409e..62c11edfe 100644 --- a/pkg/gui/recent_repos_panel.go +++ b/pkg/gui/recent_repos_panel.go @@ -37,7 +37,7 @@ func (gui *Gui) handleCreateRecentReposMenu(g *gocui.Gui, v *gocui.View) error { } } - return gui.createMenuNew(gui.Tr.SLocalize("RecentRepos"), menuItems, createMenuOptions{showCancel: true}) + return gui.createMenu(gui.Tr.SLocalize("RecentRepos"), menuItems, createMenuOptions{showCancel: true}) } // updateRecentRepoList registers the fact that we opened lazygit in this repo, diff --git a/pkg/gui/reflog_reset_options_panel.go b/pkg/gui/reflog_reset_options_panel.go index 11315a901..54edad475 100644 --- a/pkg/gui/reflog_reset_options_panel.go +++ b/pkg/gui/reflog_reset_options_panel.go @@ -51,5 +51,5 @@ func (gui *Gui) handleCreateReflogResetMenu(g *gocui.Gui, v *gocui.View) error { }, } - return gui.createMenuNew("", menuItems, createMenuOptions{showCancel: true}) + return gui.createMenu("", menuItems, createMenuOptions{showCancel: true}) } diff --git a/pkg/gui/workspace_reset_options_panel.go b/pkg/gui/workspace_reset_options_panel.go index 5f92c0efb..6cc3f8da0 100644 --- a/pkg/gui/workspace_reset_options_panel.go +++ b/pkg/gui/workspace_reset_options_panel.go @@ -89,5 +89,5 @@ func (gui *Gui) handleCreateResetMenu(g *gocui.Gui, v *gocui.View) error { }, } - return gui.createMenuNew("", menuItems, createMenuOptions{showCancel: true}) + return gui.createMenu("", menuItems, createMenuOptions{showCancel: true}) } |