diff options
| author | Jesse Duffield <jessedduffield@gmail.com> | 2018-12-08 16:54:54 +1100 |
|---|---|---|
| committer | Jesse Duffield <jessedduffield@gmail.com> | 2018-12-11 22:02:12 +1100 |
| commit | 9489a9447396b30bca86ea3df201cacfdffdb1a9 (patch) | |
| tree | ae251c28096f2bde6b1647603852782c58329d4c /pkg/gui/menu_panel.go | |
| parent | e0ff46fe53503d74fc63c90fc5ddc4d9468b60d5 (diff) | |
Make merge panel its own panel
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 8ce60f6be..6dca1ad35 100644 --- a/pkg/gui/menu_panel.go +++ b/pkg/gui/menu_panel.go @@ -2,7 +2,6 @@ package gui import ( "fmt" - "strings" "github.com/jesseduffield/gocui" "github.com/jesseduffield/lazygit/pkg/utils" @@ -50,7 +49,7 @@ func (gui *Gui) handleMenuClose(g *gocui.Gui, v *gocui.View) error { return gui.returnFocus(g, v) } -func (gui *Gui) createMenu(items interface{}, handlePress func(int) error) error { +func (gui *Gui) createMenu(title string, items interface{}, handlePress func(int) error) error { list, err := utils.RenderList(items) if err != nil { return err @@ -58,7 +57,7 @@ func (gui *Gui) createMenu(items interface{}, handlePress func(int) error) error x0, y0, x1, y1 := gui.getConfirmationPanelDimensions(gui.g, list) menuView, _ := gui.g.SetView("menu", x0, y0, x1, y1, 0) - menuView.Title = strings.Title(gui.Tr.SLocalize("menu")) + menuView.Title = title menuView.FgColor = gocui.ColorWhite menuView.Clear() fmt.Fprint(menuView, list) @@ -66,7 +65,13 @@ func (gui *Gui) createMenu(items interface{}, handlePress func(int) error) error wrappedHandlePress := func(g *gocui.Gui, v *gocui.View) error { selectedLine := gui.State.Panels.Menu.SelectedLine - return handlePress(selectedLine) + if err := handlePress(selectedLine); err != nil { + return err + } + if _, err := gui.g.SetViewOnBottom("menu"); err != nil { + return err + } + return gui.returnFocus(gui.g, menuView) } if err := gui.g.SetKeybinding("menu", gocui.KeySpace, gocui.ModNone, wrappedHandlePress); err != nil { |