diff options
| author | Jesse Duffield <jessedduffield@gmail.com> | 2020-08-22 11:05:37 +1000 |
|---|---|---|
| committer | Jesse Duffield <jessedduffield@gmail.com> | 2020-08-23 14:29:18 +1000 |
| commit | fbd61fcd17d495e9605bcf1f765663f861839cac (patch) | |
| tree | d5d9eaa12e3e5fbefa5c50282af8f8207d5bb6a3 /pkg/gui/layout.go | |
| parent | b1529f19ad527d29a469de09c11c37d7f61d8d16 (diff) | |
refactor how we handle different modes
Diffstat (limited to 'pkg/gui/layout.go')
| -rw-r--r-- | pkg/gui/layout.go | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/pkg/gui/layout.go b/pkg/gui/layout.go index 1687a26dd..8fb180e8b 100644 --- a/pkg/gui/layout.go +++ b/pkg/gui/layout.go @@ -16,11 +16,11 @@ func (gui *Gui) informationStr() string { if gui.inDiffMode() { return utils.ColoredString(fmt.Sprintf("%s %s %s", gui.Tr.SLocalize("showingGitDiff"), "git diff "+gui.diffStr(), utils.ColoredString(gui.Tr.SLocalize("(reset)"), color.Underline)), color.FgMagenta) } else if gui.inFilterMode() { - return utils.ColoredString(fmt.Sprintf("%s '%s' %s", gui.Tr.SLocalize("filteringBy"), gui.State.FilterPath, utils.ColoredString(gui.Tr.SLocalize("(reset)"), color.Underline)), color.FgRed, color.Bold) + return utils.ColoredString(fmt.Sprintf("%s '%s' %s", gui.Tr.SLocalize("filteringBy"), gui.State.Modes.Filtering.Path, utils.ColoredString(gui.Tr.SLocalize("(reset)"), color.Underline)), color.FgRed, color.Bold) } else if gui.GitCommand.PatchManager.Active() { return utils.ColoredString(fmt.Sprintf("%s %s", gui.Tr.SLocalize("buildingPatch"), utils.ColoredString(gui.Tr.SLocalize("(reset)"), color.Underline)), color.FgYellow, color.Bold) - } else if len(gui.State.CherryPickedCommits) > 0 { - return utils.ColoredString(fmt.Sprintf("%d commits copied", len(gui.State.CherryPickedCommits)), color.FgCyan) + } else if len(gui.State.Modes.CherryPicking.CherryPickedCommits) > 0 { + return utils.ColoredString(fmt.Sprintf("%d commits copied", len(gui.State.Modes.CherryPicking.CherryPickedCommits)), color.FgCyan) } else if gui.g.Mouse { donate := color.New(color.FgMagenta, color.Underline).Sprint(gui.Tr.SLocalize("Donate")) return donate + " " + gui.Config.GetVersion() |