go/lazygit
1
0
Fork 0
mirror of https://github.com/jesseduffield/lazygit.git synced 2025-08-10 22:42:00 +02:00
Code Issues Releases Activity

Move initialization of global gocui properties to onUserConfigLoaded

Browse Source
This commit is contained in:
Stefan Haller
2024-07-30 11:43:15 +02:00
parent 65a2eccfdb
commit 04d7907864
1 changed files with 8 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
pkg/gui/gui.go
View File

@@ -386,6 +386,14 @@ func (gui *Gui) onUserConfigLoaded() error {
gui.setColorScheme() gui.setColorScheme()
gui.configureViewProperties() gui.configureViewProperties()
gui.g.SearchEscapeKey = keybindings.GetKey(userConfig.Keybinding.Universal.Return)
gui.g.NextSearchMatchKey = keybindings.GetKey(userConfig.Keybinding.Universal.NextMatch)
gui.g.PrevSearchMatchKey = keybindings.GetKey(userConfig.Keybinding.Universal.PrevMatch)
gui.g.ShowListFooter = userConfig.Gui.ShowListFooter
gui.g.Mouse = userConfig.Gui.MouseEvents
if gui.previousLanguageConfig != userConfig.Gui.Language { if gui.previousLanguageConfig != userConfig.Gui.Language {
tr, err := i18n.NewTranslationSetFromConfig(gui.Log, userConfig.Gui.Language) tr, err := i18n.NewTranslationSetFromConfig(gui.Log, userConfig.Gui.Language)
if err != nil { if err != nil {
@@ -719,20 +727,7 @@ func (gui *Gui) Run(startArgs appTypes.StartArgs) error {
// breakpoints and stepping through code can easily take more than 30s. // breakpoints and stepping through code can easily take more than 30s.
deadlock.Opts.Disable = !gui.Debug || os.Getenv(components.WAIT_FOR_DEBUGGER_ENV_VAR) != "" deadlock.Opts.Disable = !gui.Debug || os.Getenv(components.WAIT_FOR_DEBUGGER_ENV_VAR) != ""
userConfig := gui.UserConfig
gui.g.OnSearchEscape = func() error { gui.helpers.Search.Cancel(); return nil } gui.g.OnSearchEscape = func() error { gui.helpers.Search.Cancel(); return nil }
gui.g.SearchEscapeKey = keybindings.GetKey(userConfig().Keybinding.Universal.Return)
gui.g.NextSearchMatchKey = keybindings.GetKey(userConfig().Keybinding.Universal.NextMatch)
gui.g.PrevSearchMatchKey = keybindings.GetKey(userConfig().Keybinding.Universal.PrevMatch)
gui.g.ShowListFooter = userConfig().Gui.ShowListFooter
if userConfig().Gui.MouseEvents {
gui.g.Mouse = true
}
gui.setColorScheme()
gui.g.SetManager(gocui.ManagerFunc(gui.layout)) gui.g.SetManager(gocui.ManagerFunc(gui.layout))
@@ -740,8 +735,6 @@ func (gui *Gui) Run(startArgs appTypes.StartArgs) error {
return err return err
} }
gui.configureViewProperties()
// onNewRepo must be called after g.SetManager because SetManager deletes keybindings // onNewRepo must be called after g.SetManager because SetManager deletes keybindings
if err := gui.onNewRepo(startArgs, context.NO_CONTEXT); err != nil { if err := gui.onNewRepo(startArgs, context.NO_CONTEXT); err != nil {
return err return err