go/lazygit
1
0
Fork 0
mirror of https://github.com/jesseduffield/lazygit.git synced 2025-03-25 22:01:14 +02:00
Code Issues Releases Activity

some more UI logic

Browse Source
This commit is contained in:
Jesse Duffield 2020-03-29 18:15:21 +11:00
parent 647ab9bf0f
commit 47ff388549
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/gui/diffing.go
View File

@ -18,6 +18,8 @@ func (gui *Gui) exitDiffMode() error {
} }
func (gui *Gui) renderDiff() error { func (gui *Gui) renderDiff() error {
gui.getMainView().Title = "Diff"
gui.State.SplitMainPanel = false
filterArg := "" filterArg := ""
if gui.inFilterMode() { if gui.inFilterMode() {
filterArg = fmt.Sprintf(" -- %s", gui.State.FilterPath) filterArg = fmt.Sprintf(" -- %s", gui.State.FilterPath)

12
pkg/gui/files_panel.go
View File

@ -27,6 +27,12 @@ func (gui *Gui) getSelectedFile() (*commands.File, error) {
} }
func (gui *Gui) selectFile(alreadySelected bool) 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() file, err := gui.getSelectedFile()
if err != nil { if err != nil {
if err != gui.Errors.ErrNoFiles { if err != gui.Errors.ErrNoFiles {
@ -37,8 +43,6 @@ func (gui *Gui) selectFile(alreadySelected bool) error {
return gui.newStringTask("main", gui.Tr.SLocalize("NoChangedFiles")) return gui.newStringTask("main", gui.Tr.SLocalize("NoChangedFiles"))
} }
gui.getFilesView().FocusPoint(0, gui.State.Panels.Files.SelectedLine)
if !alreadySelected { if !alreadySelected {
if err := gui.resetOrigin(gui.getMainView()); err != nil { if err := gui.resetOrigin(gui.getMainView()); err != nil {
return err return err
@ -48,10 +52,6 @@ func (gui *Gui) selectFile(alreadySelected bool) error {
} }
} }
if gui.inDiffMode() {
return gui.renderDiff()
}
if file.HasInlineMergeConflicts { if file.HasInlineMergeConflicts {
gui.getMainView().Title = gui.Tr.SLocalize("MergeConflictsTitle") gui.getMainView().Title = gui.Tr.SLocalize("MergeConflictsTitle")
gui.State.SplitMainPanel = false gui.State.SplitMainPanel = false