diff options
| author | Jesse Duffield <jessedduffield@gmail.com> | 2020-03-29 18:15:21 +1100 |
|---|---|---|
| committer | Jesse Duffield <jessedduffield@gmail.com> | 2020-03-29 18:26:24 +1100 |
| commit | 47ff388549070394a5349cd483c7c90b2f87be0b (patch) | |
| tree | 2f41e2857ecdfc55ac44567011d82a8f12f15e89 /pkg | |
| parent | 647ab9bf0f94423722deb561d452bbccc5ce3281 (diff) | |
some more UI logic
Diffstat (limited to 'pkg')
| -rw-r--r-- | pkg/gui/diffing.go | 2 | ||||
| -rw-r--r-- | pkg/gui/files_panel.go | 12 |
2 files changed, 8 insertions, 6 deletions
diff --git a/pkg/gui/diffing.go b/pkg/gui/diffing.go index dc5fca1e8..633efa600 100644 --- a/pkg/gui/diffing.go +++ b/pkg/gui/diffing.go @@ -18,6 +18,8 @@ func (gui *Gui) exitDiffMode() error { } func (gui *Gui) renderDiff() error { + gui.getMainView().Title = "Diff" + gui.State.SplitMainPanel = false filterArg := "" if gui.inFilterMode() { filterArg = fmt.Sprintf(" -- %s", gui.State.FilterPath) diff --git a/pkg/gui/files_panel.go b/pkg/gui/files_panel.go index 620453d5a..635ca69dd 100644 --- a/pkg/gui/files_panel.go +++ b/pkg/gui/files_panel.go @@ -27,6 +27,12 @@ func (gui *Gui) getSelectedFile() (*commands.File, error) { } func (gui *Gui) selectFile(alreadySelected bool) error { + gui.getFilesView().FocusPoint(0, gui.State.Panels.Files.SelectedLine) + + if gui.inDiffMode() { + return gui.renderDiff() + } + file, err := gui.getSelectedFile() if err != nil { if err != gui.Errors.ErrNoFiles { @@ -37,8 +43,6 @@ func (gui *Gui) selectFile(alreadySelected bool) error { return gui.newStringTask("main", gui.Tr.SLocalize("NoChangedFiles")) } - gui.getFilesView().FocusPoint(0, gui.State.Panels.Files.SelectedLine) - if !alreadySelected { if err := gui.resetOrigin(gui.getMainView()); err != nil { return err @@ -48,10 +52,6 @@ func (gui *Gui) selectFile(alreadySelected bool) error { } } - if gui.inDiffMode() { - return gui.renderDiff() - } - if file.HasInlineMergeConflicts { gui.getMainView().Title = gui.Tr.SLocalize("MergeConflictsTitle") gui.State.SplitMainPanel = false |