diff options
| author | Jesse Duffield <jessedduffield@gmail.com> | 2021-04-06 09:50:09 +1000 |
|---|---|---|
| committer | Jesse Duffield <jessedduffield@gmail.com> | 2021-04-06 19:34:32 +1000 |
| commit | 390b7ddc5e92564bc9e71b83c600a778fbefd54a (patch) | |
| tree | 0ce1a6e5d55f904cb2903c715a809935595313b3 /pkg/gui/modes.go | |
| parent | 38739b16bcb339817cda5bcb5a07379635790184 (diff) | |
change order of filtering and patch building so that esc key exits patch building mode first
Diffstat (limited to 'pkg/gui/modes.go')
| -rw-r--r-- | pkg/gui/modes.go | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/pkg/gui/modes.go b/pkg/gui/modes.go index 5f783c4eb..f97e050cf 100644 --- a/pkg/gui/modes.go +++ b/pkg/gui/modes.go @@ -26,26 +26,26 @@ func (gui *Gui) modeStatuses() []modeStatus { reset: gui.exitDiffMode, }, { - isActive: gui.State.Modes.Filtering.Active, + isActive: gui.GitCommand.PatchManager.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, + fmt.Sprintf("%s %s", gui.Tr.LcBuildingPatch, utils.ColoredString(gui.Tr.ResetInParentheses, color.Underline)), + color.FgYellow, color.Bold, ) }, - reset: gui.exitFilterMode, + reset: gui.handleResetPatch, }, { - isActive: gui.GitCommand.PatchManager.Active, + isActive: gui.State.Modes.Filtering.Active, description: func() string { return utils.ColoredString( - fmt.Sprintf("%s %s", gui.Tr.LcBuildingPatch, utils.ColoredString(gui.Tr.ResetInParentheses, color.Underline)), - color.FgYellow, + 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.handleResetPatch, + reset: gui.exitFilterMode, }, { isActive: gui.State.Modes.CherryPicking.Active, |