mirror of
				https://github.com/jesseduffield/lazygit.git
				synced 2025-10-30 23:57:43 +02:00 
			
		
		
		
	Press enter in focused main view when user config is on
This commit is contained in:
		| @@ -30,6 +30,13 @@ func NewMainViewController( | ||||
| } | ||||
|  | ||||
| func (self *MainViewController) GetKeybindings(opts types.KeybindingsOpts) []*types.Binding { | ||||
| 	var goIntoDescription string | ||||
| 	// We only want to show the "enter" menu item if the user config is true; | ||||
| 	// leaving the description empty causes it to be hidden | ||||
| 	if self.c.UserConfig().Gui.ShowSelectionInFocusedMainView { | ||||
| 		goIntoDescription = self.c.Tr.EnterStaging | ||||
| 	} | ||||
|  | ||||
| 	return []*types.Binding{ | ||||
| 		{ | ||||
| 			Key:             opts.GetKey(opts.Config.Universal.TogglePanel), | ||||
| @@ -44,6 +51,11 @@ func (self *MainViewController) GetKeybindings(opts types.KeybindingsOpts) []*ty | ||||
| 			Description:     self.c.Tr.ExitFocusedMainView, | ||||
| 			DisplayOnScreen: true, | ||||
| 		}, | ||||
| 		{ | ||||
| 			Key:         opts.GetKey(opts.Config.Universal.GoInto), | ||||
| 			Handler:     self.enter, | ||||
| 			Description: goIntoDescription, | ||||
| 		}, | ||||
| 		{ | ||||
| 			// overriding this because we want to read all of the task's output before we start searching | ||||
| 			Key:         opts.GetKey(opts.Config.Universal.StartSearch), | ||||
| @@ -88,6 +100,15 @@ func (self *MainViewController) escape() error { | ||||
| 	return nil | ||||
| } | ||||
|  | ||||
| func (self *MainViewController) enter() error { | ||||
| 	parentCtx := self.context.GetParentContext() | ||||
| 	if parentCtx.GetOnClickFocusedMainView() != nil { | ||||
| 		return parentCtx.GetOnClickFocusedMainView()( | ||||
| 			self.context.GetViewName(), self.context.GetView().SelectedLineIdx()) | ||||
| 	} | ||||
| 	return nil | ||||
| } | ||||
|  | ||||
| func (self *MainViewController) onClickInAlreadyFocusedView(opts gocui.ViewMouseBindingOpts) error { | ||||
| 	if self.context.GetView().Highlight && !opts.IsDoubleClick { | ||||
| 		return nil | ||||
|   | ||||
| @@ -515,6 +515,7 @@ type TranslationSet struct { | ||||
| 	EmptyPatchError                       string | ||||
| 	EnterCommitFile                       string | ||||
| 	EnterCommitFileTooltip                string | ||||
| 	EnterStaging                          string | ||||
| 	ExitCustomPatchBuilder                string | ||||
| 	ExitFocusedMainView                   string | ||||
| 	EnterUpstream                         string | ||||
| @@ -1609,6 +1610,7 @@ func EnglishTranslationSet() *TranslationSet { | ||||
| 		EmptyPatchError:                      "Patch is still empty. Add some files or lines to your patch first.", | ||||
| 		EnterCommitFile:                      "Enter file / Toggle directory collapsed", | ||||
| 		EnterCommitFileTooltip:               "If a file is selected, enter the file so that you can add/remove individual lines to the custom patch. If a directory is selected, toggle the directory.", | ||||
| 		EnterStaging:                         "Enter staging/patch building", | ||||
| 		ExitCustomPatchBuilder:               `Exit custom patch builder`, | ||||
| 		ExitFocusedMainView:                  "Exit back to side panel", | ||||
| 		EnterUpstream:                        `Enter upstream as '<remote> <branchname>'`, | ||||
|   | ||||
		Reference in New Issue
	
	Block a user