diff options
Diffstat (limited to 'pkg/gui/files_panel.go')
| -rw-r--r-- | pkg/gui/files_panel.go | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/pkg/gui/files_panel.go b/pkg/gui/files_panel.go index 59ec172b3..d95875d5e 100644 --- a/pkg/gui/files_panel.go +++ b/pkg/gui/files_panel.go @@ -124,13 +124,13 @@ func (gui *Gui) refreshFilesAndSubmodules() error { } gui.g.Update(func(g *gocui.Gui) error { - if err := gui.postRefreshUpdate(gui.Contexts.Submodules.Context); err != nil { + if err := gui.postRefreshUpdate(gui.Contexts.Submodules); err != nil { gui.Log.Error(err) } if gui.getFilesView().Context == FILES_CONTEXT_KEY { // doing this a little custom (as opposed to using gui.postRefreshUpdate) because we handle selecting the file explicitly below - if err := gui.Contexts.Files.Context.HandleRender(); err != nil { + if err := gui.Contexts.Files.HandleRender(); err != nil { return err } } @@ -210,7 +210,7 @@ func (gui *Gui) enterFile(forceSecondaryFocused bool, selectedLineIdx int) error if file.HasMergeConflicts { return gui.createErrorPanel(gui.Tr.FileStagingRequirements) } - _ = gui.pushContext(gui.Contexts.Staging.Context) + _ = gui.pushContext(gui.Contexts.Staging) return gui.handleRefreshStagingPanel(forceSecondaryFocused, selectedLineIdx) // TODO: check if this is broken, try moving into context code } @@ -412,7 +412,7 @@ func (gui *Gui) handleCommitPress() error { } gui.g.Update(func(g *gocui.Gui) error { - if err := gui.pushContext(gui.Contexts.CommitMessage.Context); err != nil { + if err := gui.pushContext(gui.Contexts.CommitMessage); err != nil { return err } @@ -777,7 +777,7 @@ func (gui *Gui) handleSwitchToMerge() error { return gui.createErrorPanel(gui.Tr.FileNoMergeCons) } - return gui.pushContext(gui.Contexts.Merging.Context) + return gui.pushContext(gui.Contexts.Merging) } func (gui *Gui) openFile(filename string) error { @@ -842,7 +842,7 @@ func (gui *Gui) handleToggleDirCollapsed() error { gui.State.FileManager.ToggleCollapsed(node.GetPath()) - if err := gui.postRefreshUpdate(gui.Contexts.Files.Context); err != nil { + if err := gui.postRefreshUpdate(gui.Contexts.Files); err != nil { gui.Log.Error(err) } @@ -865,7 +865,7 @@ func (gui *Gui) handleToggleFileTreeView() error { } if gui.getFilesView().Context == FILES_CONTEXT_KEY { - if err := gui.Contexts.Files.Context.HandleRender(); err != nil { + if err := gui.Contexts.Files.HandleRender(); err != nil { return err } } |