From 8840c1a2b75749724b2dc6e329c2e150db93bc5a Mon Sep 17 00:00:00 2001 From: Jesse Duffield Date: Sat, 13 Jan 2024 16:55:06 +1100 Subject: [PATCH] Remove 'v' menu keys We can no longer use this because 'v' is globally reserved for range select. Conveniently it was the first item in the menu anyway for both of these. --- pkg/gui/controllers/branches_controller.go | 1 - pkg/gui/controllers/helpers/merge_and_rebase_helper.go | 1 - 2 files changed, 2 deletions(-) diff --git a/pkg/gui/controllers/branches_controller.go b/pkg/gui/controllers/branches_controller.go index e0a38d463..866f3eae3 100644 --- a/pkg/gui/controllers/branches_controller.go +++ b/pkg/gui/controllers/branches_controller.go @@ -165,7 +165,6 @@ func (self *BranchesController) viewUpstreamOptions(selectedBranch *models.Branc ShowBranchHeads: false, }) }, - Key: 'v', } unsetUpstreamItem := &types.MenuItem{ diff --git a/pkg/gui/controllers/helpers/merge_and_rebase_helper.go b/pkg/gui/controllers/helpers/merge_and_rebase_helper.go index de34f2193..2b94dfa7a 100644 --- a/pkg/gui/controllers/helpers/merge_and_rebase_helper.go +++ b/pkg/gui/controllers/helpers/merge_and_rebase_helper.go @@ -169,7 +169,6 @@ func (self *MergeAndRebaseHelper) PromptForConflictHandling() error { OnPress: func() error { return self.c.PushContext(self.c.Contexts().Files) }, - Key: 'v', }, { Label: fmt.Sprintf(self.c.Tr.AbortMenuItem, mode),