go/lazygit
1
0
Fork 0
mirror of https://github.com/jesseduffield/lazygit.git synced 2025-04-21 12:16:54 +02:00
Code Issues Releases Activity

change order of filtering and patch building so that esc key exits patch building mode first

Browse Source
This commit is contained in:
Jesse Duffield 2021-04-06 09:50:09 +10:00
parent 38739b16bc
commit 390b7ddc5e
1 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
pkg/gui/modes.go
View File

@ -25,17 +25,6 @@ func (gui *Gui) modeStatuses() []modeStatus {
}, },
reset: gui.exitDiffMode, reset: gui.exitDiffMode,
}, },
{
isActive: gui.State.Modes.Filtering.Active,
description: func() string {
return utils.ColoredString(
fmt.Sprintf("%s '%s' %s", gui.Tr.LcFilteringBy, gui.State.Modes.Filtering.GetPath(), utils.ColoredString(gui.Tr.ResetInParentheses, color.Underline)),
color.FgRed,
color.Bold,
)
},
reset: gui.exitFilterMode,
},
{ {
isActive: gui.GitCommand.PatchManager.Active, isActive: gui.GitCommand.PatchManager.Active,
description: func() string { description: func() string {
@ -47,6 +36,17 @@ func (gui *Gui) modeStatuses() []modeStatus {
}, },
reset: gui.handleResetPatch, reset: gui.handleResetPatch,
}, },
{
isActive: gui.State.Modes.Filtering.Active,
description: func() string {
return utils.ColoredString(
fmt.Sprintf("%s '%s' %s", gui.Tr.LcFilteringBy, gui.State.Modes.Filtering.GetPath(), utils.ColoredString(gui.Tr.ResetInParentheses, color.Underline)),
color.FgRed,
color.Bold,
)
},
reset: gui.exitFilterMode,
},
{ {
isActive: gui.State.Modes.CherryPicking.Active, isActive: gui.State.Modes.CherryPicking.Active,
description: func() string { description: func() string {