diff options
| author | Jesse Duffield <jessedduffield@gmail.com> | 2020-08-22 11:44:03 +1000 |
|---|---|---|
| committer | Jesse Duffield <jessedduffield@gmail.com> | 2020-08-23 14:29:18 +1000 |
| commit | c2b154acad4e1040bdc0e09cf44733ccd877923b (patch) | |
| tree | d963fb7f4cdb405c8dfa610c94835d5c00822498 /pkg/gui/diffing.go | |
| parent | fbd61fcd17d495e9605bcf1f765663f861839cac (diff) | |
better handling of our different modes and also cherry picking
Diffstat (limited to 'pkg/gui/diffing.go')
| -rw-r--r-- | pkg/gui/diffing.go | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/pkg/gui/diffing.go b/pkg/gui/diffing.go index 2093e1170..968887b30 100644 --- a/pkg/gui/diffing.go +++ b/pkg/gui/diffing.go @@ -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"), |