sysutils/lazygit
1
0
Fork 0
mirror of https://github.com/jesseduffield/lazygit.git synced 2025-07-31 14:24:25 +03:00
Code Activity

centralise logic for rendering options map

Browse Source
This commit is contained in:
Jesse Duffield
2020-08-23 10:50:27 +10:00
parent f876d8fdc8
commit fda9f4ea7a
6 changed files with 43 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
pkg/gui/context.go
View File

@ -47,15 +47,24 @@ type Context interface {
GetKey() string
SetParentContext(Context)
GetParentContext() Context
GetOptionsMap() map[string]string
}
type BasicContext struct {
OnFocus func() error
OnFocusLost func() error
OnRender func() error
Kind int
Key string
ViewName string
OnFocus func() error
OnFocusLost func() error
OnRender func() error
OnGetOptionsMap func() map[string]string
Kind int
Key string
ViewName string
}
func (c BasicContext) GetOptionsMap() map[string]string {
if c.OnGetOptionsMap != nil {
return c.OnGetOptionsMap()
}
return nil
}
func (c BasicContext) SetWindowName(windowName string) {
@ -244,9 +253,10 @@ func (gui *Gui) contextTree() ContextTree {
// TODO: centralise the code here
// return gui.refreshMergePanel()
},
Kind: MAIN_CONTEXT,
ViewName: "main",
Key: MAIN_MERGING_CONTEXT_KEY,
Kind: MAIN_CONTEXT,
ViewName: "main",
Key: MAIN_MERGING_CONTEXT_KEY,
OnGetOptionsMap: gui.getMergingOptions,
},
},
Credentials: SimpleContextNode{
@ -470,10 +480,12 @@ func (gui *Gui) activateContext(c Context) error {
gui.g.Cursor = newView.Editable
// TODO: move this logic to the context
if err := gui.renderPanelOptions(); err != nil {
return err
// render the options available for the current context at the bottom of the screen
optionsMap := c.GetOptionsMap()
if optionsMap == nil {
optionsMap = gui.globalOptionsMap()
}
gui.renderOptionsMap(optionsMap)
if err := c.HandleFocus(); err != nil {
return err