mirror of
https://github.com/jesseduffield/lazygit.git
synced 2025-06-10 23:57:43 +02:00
remove old createMenu function
This commit is contained in:
parent
6fdc1791e4
commit
5b9996b16f
@ -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})
|
||||||
}
|
}
|
||||||
|
@ -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})
|
||||||
}
|
}
|
||||||
|
@ -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 {
|
func (gui *Gui) handleStashChanges(g *gocui.Gui, v *gocui.View) error {
|
||||||
|
@ -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{})
|
||||||
}
|
}
|
||||||
|
@ -48,7 +48,7 @@ type createMenuOptions struct {
|
|||||||
showCancel bool
|
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 {
|
if createMenuOptions.showCancel {
|
||||||
// this is mutative but I'm okay with that for now
|
// this is mutative but I'm okay with that for now
|
||||||
items = append(items, &menuItem{
|
items = append(items, &menuItem{
|
||||||
@ -116,55 +116,3 @@ func (gui *Gui) createMenuNew(title string, items []*menuItem, createMenuOptions
|
|||||||
})
|
})
|
||||||
return nil
|
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
|
|
||||||
}
|
|
||||||
|
@ -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{})
|
||||||
}
|
}
|
||||||
|
@ -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 {
|
func (gui *Gui) getPatchCommitIndex() int {
|
||||||
|
@ -31,7 +31,7 @@ func (gui *Gui) handleCreateRebaseOptionsMenu(g *gocui.Gui, v *gocui.View) error
|
|||||||
title = gui.Tr.SLocalize("RebaseOptionsTitle")
|
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 {
|
func (gui *Gui) genericMergeCommand(command string) error {
|
||||||
|
@ -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,
|
// updateRecentRepoList registers the fact that we opened lazygit in this repo,
|
||||||
|
@ -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})
|
||||||
}
|
}
|
||||||
|
@ -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})
|
||||||
}
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user