go/lazygit
1
0
Fork 0
mirror of https://github.com/jesseduffield/lazygit.git synced 2025-06-15 00:15:32 +02:00
Code Issues Releases Activity

better handling of our different modes and also cherry picking

Browse Source
This commit is contained in:
Jesse Duffield
2020-08-22 11:44:03 +10:00
parent fbd61fcd17
commit c2b154acad
13 changed files with 185 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
pkg/gui/diffing.go
View File

@ -7,10 +7,6 @@ import (
"github.com/jesseduffield/gocui"
)
func (gui *Gui) inDiffMode() bool {
return gui.State.Modes.Diffing.Ref != ""
}
func (gui *Gui) exitDiffMode() error {
gui.State.Modes.Diffing = Diffing{}
return gui.refreshSidePanels(refreshOptions{mode: ASYNC})
@ -19,7 +15,7 @@ func (gui *Gui) exitDiffMode() error {
func (gui *Gui) renderDiff() error {
filterArg := ""
if gui.inFilterMode() {
if gui.State.Modes.Filtering.Active() {
filterArg = fmt.Sprintf(" -- %s", gui.State.Modes.Filtering.Path)
}
@ -126,7 +122,7 @@ func (gui *Gui) handleCreateDiffingMenuPanel(g *gocui.Gui, v *gocui.View) error
},
}...)
if gui.inDiffMode() {
if gui.State.Modes.Diffing.Active() {
menuItems = append(menuItems, []*menuItem{
{
displayString: gui.Tr.SLocalize("swapDiff"),