go/lazygit
1
0
Fork 0
mirror of https://github.com/jesseduffield/lazygit.git synced 2024-12-04 10:34:55 +02:00
Code Issues Releases Activity

fix logic for entering merging panel

Browse Source
This commit is contained in:
Jesse Duffield 2020-08-23 11:08:51 +10:00
parent fda9f4ea7a
commit a95fd581fd
2 changed files with 12 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
pkg/gui/context.go
View File

@ -249,9 +249,7 @@ func (gui *Gui) contextTree() ContextTree {
Merging: SimpleContextNode{
Context: BasicContext{
OnFocus: func() error {
return nil
// TODO: centralise the code here
// return gui.refreshMergePanel()
return gui.refreshMergePanel()
},
Kind: MAIN_CONTEXT,
ViewName: "main",
@ -448,13 +446,7 @@ func (gui *Gui) activateContext(c Context) error {
if err != nil {
return gui.returnFromContext()
}
// if the new context's view was previously displaying another context, render the new context
if v.Context != c.GetKey() {
if err := c.HandleRender(); err != nil {
return err
}
}
originalViewContextKey := v.Context
// ensure that any other window for which this view was active is now set to the default for that window.
gui.setViewAsActiveForWindow(viewName)
@ -475,10 +467,16 @@ func (gui *Gui) activateContext(c Context) error {
return err
}
newView := gui.g.CurrentView()
newView.Context = c.GetKey()
// if the new context's view was previously displaying another context, render the new context
if originalViewContextKey != c.GetKey() {
if err := c.HandleRender(); err != nil {
return err
}
}
gui.g.Cursor = newView.Editable
v.Context = c.GetKey()
gui.g.Cursor = v.Editable
// render the options available for the current context at the bottom of the screen
optionsMap := c.GetOptionsMap()

1
pkg/gui/files_panel.go
View File

@ -572,6 +572,7 @@ func (gui *Gui) handleSwitchToMerge() error {
if !file.HasInlineMergeConflicts {
return gui.createErrorPanel(gui.Tr.SLocalize("FileNoMergeCons"))
}
return gui.switchContext(gui.Contexts.Merging.Context)
}