chore: change to work return-alt1 on all views

jesseduffield · Feb 11, 2023 · 39c20bc · 39c20bc
1 parent 823d95a
commit 39c20bc
Show file tree

Hide file tree

Showing 9 changed files with 50 additions and 0 deletions.
diff --git a/pkg/gui/confirmation_panel.go b/pkg/gui/confirmation_panel.go
@@ -251,6 +251,11 @@ func (gui *Gui) setKeyBindings(cancel context.CancelFunc, opts types.CreatePopup
  Key: keybindings.GetKey(keybindingConfig.Universal.Return),
  Handler: gui.wrappedConfirmationFunction(cancel, opts.HandleClose),
  },
+ {
+ ViewName: "confirmation",
+ Key: keybindings.GetKey(keybindingConfig.Universal.ReturnAlt1),
+ Handler: gui.wrappedConfirmationFunction(cancel, opts.HandleClose),
+ },
  {
  ViewName: "confirmation",
  Key: keybindings.GetKey(keybindingConfig.Universal.TogglePanel),
@@ -276,6 +281,11 @@ func (gui *Gui) setKeyBindings(cancel context.CancelFunc, opts types.CreatePopup
  Key: keybindings.GetKey(keybindingConfig.Universal.Return),
  Handler: gui.wrappedConfirmationFunction(cancel, opts.HandleClose),
  },
+ {
+ ViewName: "suggestions",
+ Key: keybindings.GetKey(keybindingConfig.Universal.ReturnAlt1),
+ Handler: gui.wrappedConfirmationFunction(cancel, opts.HandleClose),
+ },
  {
  ViewName: "suggestions",
  Key: keybindings.GetKey(keybindingConfig.Universal.TogglePanel),
@@ -297,9 +307,11 @@ func (gui *Gui) clearConfirmationViewKeyBindings() {
  _ = gui.g.DeleteKeybinding("confirmation", keybindings.GetKey(keybindingConfig.Universal.Confirm), gocui.ModNone)
  _ = gui.g.DeleteKeybinding("confirmation", keybindings.GetKey(keybindingConfig.Universal.ConfirmAlt1), gocui.ModNone)
  _ = gui.g.DeleteKeybinding("confirmation", keybindings.GetKey(keybindingConfig.Universal.Return), gocui.ModNone)
+ _ = gui.g.DeleteKeybinding("confirmation", keybindings.GetKey(keybindingConfig.Universal.ReturnAlt1), gocui.ModNone)
  _ = gui.g.DeleteKeybinding("suggestions", keybindings.GetKey(keybindingConfig.Universal.Confirm), gocui.ModNone)
  _ = gui.g.DeleteKeybinding("suggestions", keybindings.GetKey(keybindingConfig.Universal.ConfirmAlt1), gocui.ModNone)
  _ = gui.g.DeleteKeybinding("suggestions", keybindings.GetKey(keybindingConfig.Universal.Return), gocui.ModNone)
+ _ = gui.g.DeleteKeybinding("suggestions", keybindings.GetKey(keybindingConfig.Universal.ReturnAlt1), gocui.ModNone)
 }
 
 func (gui *Gui) refreshSuggestions() {

diff --git a/pkg/gui/controllers/commit_message_controller.go b/pkg/gui/controllers/commit_message_controller.go
@@ -41,6 +41,10 @@ func (self *CommitMessageController) GetKeybindings(opts types.KeybindingsOpts)
  Key: opts.GetKey(opts.Config.Universal.Return),
  Handler: self.close,
  },
+ {
+ Key: opts.GetKey(opts.Config.Universal.ReturnAlt1),
+ Handler: self.close,
+ },
  }
 
  return bindings

diff --git a/pkg/gui/controllers/menu_controller.go b/pkg/gui/controllers/menu_controller.go
@@ -39,6 +39,10 @@ func (self *MenuController) GetKeybindings(opts types.KeybindingsOpts) []*types.
  Key: opts.GetKey(opts.Config.Universal.Return),
  Handler: self.close,
  },
+ {
+ Key: opts.GetKey(opts.Config.Universal.ReturnAlt1),
+ Handler: self.close,
+ },
  }
 
  return bindings

diff --git a/pkg/gui/controllers/merge_conflicts_controller.go b/pkg/gui/controllers/merge_conflicts_controller.go
@@ -110,6 +110,11 @@ func (self *MergeConflictsController) GetKeybindings(opts types.KeybindingsOpts)
  Handler: self.Escape,
  Description: self.c.Tr.ReturnToFilesPanel,
  },
+ {
+ Key: opts.GetKey(opts.Config.Universal.ReturnAlt1),
+ Handler: self.Escape,
+ Description: self.c.Tr.ReturnToFilesPanel,
+ },
  }
 
  return bindings

diff --git a/pkg/gui/controllers/patch_building_controller.go b/pkg/gui/controllers/patch_building_controller.go
@@ -44,6 +44,11 @@ func (self *PatchBuildingController) GetKeybindings(opts types.KeybindingsOpts)
  Handler: self.Escape,
  Description: self.c.Tr.ExitCustomPatchBuilder,
  },
+ {
+ Key: opts.GetKey(opts.Config.Universal.ReturnAlt1),
+ Handler: self.Escape,
+ Description: self.c.Tr.ExitCustomPatchBuilder,
+ },
  }
 }
 

diff --git a/pkg/gui/controllers/remote_branches_controller.go b/pkg/gui/controllers/remote_branches_controller.go
@@ -64,6 +64,11 @@ func (self *RemoteBranchesController) GetKeybindings(opts types.KeybindingsOpts)
  Handler: self.escape,
  Description: self.c.Tr.ReturnToRemotesList,
  },
+ {
+ Key: opts.GetKey(opts.Config.Universal.ReturnAlt1),
+ Handler: self.escape,
+ Description: self.c.Tr.ReturnToRemotesList,
+ },
  {
  Key: opts.GetKey(opts.Config.Commits.ViewResetOptions),
  Handler: self.checkSelected(self.createResetMenu),

diff --git a/pkg/gui/controllers/snake_controller.go b/pkg/gui/controllers/snake_controller.go
@@ -47,6 +47,10 @@ func (self *SnakeController) GetKeybindings(opts types.KeybindingsOpts) []*types
  Key: opts.GetKey(opts.Config.Universal.Return),
  Handler: self.Escape,
  },
+ {
+ Key: opts.GetKey(opts.Config.Universal.ReturnAlt1),
+ Handler: self.Escape,
+ },
  }
 
  return bindings

diff --git a/pkg/gui/controllers/staging_controller.go b/pkg/gui/controllers/staging_controller.go
@@ -53,6 +53,11 @@ func (self *StagingController) GetKeybindings(opts types.KeybindingsOpts) []*typ
  Handler: self.Escape,
  Description: self.c.Tr.ReturnToFilesPanel,
  },
+ {
+ Key: opts.GetKey(opts.Config.Universal.ReturnAlt1),
+ Handler: self.Escape,
+ Description: self.c.Tr.ReturnToFilesPanel,
+ },
  {
  Key: opts.GetKey(opts.Config.Universal.TogglePanel),
  Handler: self.TogglePanel,

diff --git a/pkg/gui/keybindings.go b/pkg/gui/keybindings.go
@@ -331,6 +331,12 @@ func (self *Gui) GetInitialKeybindings() ([]*types.Binding, []*gocui.ViewMouseBi
  Modifier: gocui.ModNone,
  Handler: self.handleSearchEscape,
  },
+ {
+ ViewName: "search",
+ Key: opts.GetKey(opts.Config.Universal.ReturnAlt1),
+ Modifier: gocui.ModNone,
+ Handler: self.handleSearchEscape,
+ },
  {
  ViewName: "confirmation",
  Key: opts.GetKey(opts.Config.Universal.PrevItem),