diff options
| author | Jesse Duffield <jessedduffield@gmail.com> | 2019-11-16 12:41:04 +1100 |
|---|---|---|
| committer | Jesse Duffield <jessedduffield@gmail.com> | 2019-11-21 22:07:14 +1100 |
| commit | 7e0a8f235ef6971a98fba9c91c7fa159ca842180 (patch) | |
| tree | 888c1e23b7b49e438226d9dee2c75316532d58ae /pkg/gui/files_panel.go | |
| parent | 44bbc106a9668b8886f22812651635ec00a156fa (diff) | |
add contexts to views
Diffstat (limited to 'pkg/gui/files_panel.go')
| -rw-r--r-- | pkg/gui/files_panel.go | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkg/gui/files_panel.go b/pkg/gui/files_panel.go index ae3328eed..0205a193b 100644 --- a/pkg/gui/files_panel.go +++ b/pkg/gui/files_panel.go @@ -216,7 +216,7 @@ func (gui *Gui) enterFile(forceSecondaryFocused bool, selectedLineIdx int) error if file.HasMergeConflicts { return gui.createErrorPanel(gui.g, gui.Tr.SLocalize("FileStagingRequirements")) } - if err := gui.changeContext("staging"); err != nil { + if err := gui.changeMainViewsContext("staging"); err != nil { return err } if err := gui.switchFocus(gui.g, gui.getFilesView(), gui.getMainView()); err != nil { @@ -510,7 +510,7 @@ func (gui *Gui) handleSwitchToMerge(g *gocui.Gui, v *gocui.View) error { if !file.HasInlineMergeConflicts { return gui.createErrorPanel(g, gui.Tr.SLocalize("FileNoMergeCons")) } - if err := gui.changeContext("merging"); err != nil { + if err := gui.changeMainViewsContext("merging"); err != nil { return err } if err := gui.switchFocus(g, v, gui.getMainView()); err != nil { |