utils-code/jesseduffield.lazygit
1
0
Fork 0
mirror of https://github.com/jesseduffield/lazygit.git synced 2026-09-13 17:16:23 -04:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

Remove keybindings for menu items that are the same as the menu confirm key

Browse source 
This is needed when remapping the confirmMenu key to, say, "y", and there's a
menu that has an item with a "y" binding. This already worked correctly (confirm
takes precedence, as desired), but it's still confusing to see the item binding.
This commit is contained in:
Stefan Haller 2025-08-15 18:12:44 +02:00
parent b413710d8c
commit b3a3410a1a
1 changed files with 7 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
pkg/gui/menu_panel.go
View file

@ -3,6 +3,7 @@ package gui
import ( import (
"fmt" "fmt"
"github.com/jesseduffield/lazygit/pkg/gui/keybindings"
"github.com/jesseduffield/lazygit/pkg/gui/types" "github.com/jesseduffield/lazygit/pkg/gui/types"
"github.com/jesseduffield/lazygit/pkg/theme" "github.com/jesseduffield/lazygit/pkg/theme"
) )
@ -20,6 +21,7 @@ func (gui *Gui) createMenu(opts types.CreateMenuOptions) error {
} }
maxColumnSize := 1 maxColumnSize := 1
confirmKey := keybindings.GetKey(gui.c.UserConfig().Keybinding.Universal.ConfirmMenu)
for _, item := range opts.Items { for _, item := range opts.Items {
if item.LabelColumns == nil { if item.LabelColumns == nil {
@ -31,6 +33,11 @@ func (gui *Gui) createMenu(opts types.CreateMenuOptions) error {
} }
maxColumnSize = max(maxColumnSize, len(item.LabelColumns)) maxColumnSize = max(maxColumnSize, len(item.LabelColumns))
// Remove all item keybindings that are the same as the confirm binding
if item.Key == confirmKey {
item.Key = nil
}
} }
for _, item := range opts.Items { for _, item := range opts.Items {