sysutils/lazygit
1
0
Fork 0
mirror of https://github.com/jesseduffield/lazygit.git synced 2025-08-06 11:02:41 +03:00
Code Activity

Merge pull request #2551 from stefanhaller/fix-initial-context-activation

Browse Source
This commit is contained in:
Jesse Duffield
2023-05-01 21:22:43 +10:00
committed by GitHub
parent ee9ae8f07f d675117289
commit c6c4346d48
3 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/gui/gui_common.go
View File

@@ -74,6 +74,10 @@ func (self *guiCommon) IsCurrentContext(c types.Context) bool {
return self.CurrentContext().GetKey() == c.GetKey() return self.CurrentContext().GetKey() == c.GetKey()
} }
func (self *guiCommon) ActivateContext(context types.Context) error {
return self.gui.activateContext(context, types.OnFocusOpts{})
}
func (self *guiCommon) GetAppState() *config.AppState { func (self *guiCommon) GetAppState() *config.AppState {
return self.gui.Config.GetAppState() return self.gui.Config.GetAppState()
} }

2
pkg/gui/layout.go
View File

@@ -182,7 +182,7 @@ func (gui *Gui) onInitialViewsCreationForRepo() error {
} }
initialContext := gui.currentSideContext() initialContext := gui.currentSideContext()
if err := gui.c.PushContext(initialContext); err != nil { if err := gui.c.ActivateContext(initialContext); err != nil {
return err return err
} }

1
pkg/gui/types/common.go
View File

@@ -49,6 +49,7 @@ type IGuiCommon interface {
CurrentContext() Context CurrentContext() Context
CurrentStaticContext() Context CurrentStaticContext() Context
IsCurrentContext(Context) bool IsCurrentContext(Context) bool
ActivateContext(context Context) error
// enters search mode for the current view // enters search mode for the current view
OpenSearch() OpenSearch()