diff options
| author | Jesse Duffield <jessedduffield@gmail.com> | 2020-08-19 08:04:39 +1000 |
|---|---|---|
| committer | Jesse Duffield <jessedduffield@gmail.com> | 2020-08-23 14:29:18 +1000 |
| commit | f0c3d3fc4d43f5b7487540d5c0356f62b3b2997d (patch) | |
| tree | 2e2131bc7a05b2a2dca5c1387932e51dcb988685 /pkg/gui/files_panel.go | |
| parent | 2488e0044d2ca22f463291f6db06a61c79bd5ff0 (diff) | |
centralise setting of main views context
Diffstat (limited to 'pkg/gui/files_panel.go')
| -rw-r--r-- | pkg/gui/files_panel.go | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/pkg/gui/files_panel.go b/pkg/gui/files_panel.go index b9f69c161..b116271db 100644 --- a/pkg/gui/files_panel.go +++ b/pkg/gui/files_panel.go @@ -165,7 +165,6 @@ func (gui *Gui) enterFile(forceSecondaryFocused bool, selectedLineIdx int) error if file.HasMergeConflicts { return gui.createErrorPanel(gui.Tr.SLocalize("FileStagingRequirements")) } - gui.changeMainViewsContext("staging") // TODO: move into context code gui.switchContext(gui.Contexts.Staging.Context) return gui.refreshStagingPanel(forceSecondaryFocused, selectedLineIdx) // TODO: check if this is broken, try moving into context code @@ -577,7 +576,6 @@ func (gui *Gui) handleSwitchToMerge() error { if !file.HasInlineMergeConflicts { return gui.createErrorPanel(gui.Tr.SLocalize("FileNoMergeCons")) } - gui.changeMainViewsContext("merging") // TODO: move into context code return gui.switchContext(gui.Contexts.Merging.Context) } |