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/list_context.go | |
| parent | fbd61fcd17d495e9605bcf1f765663f861839cac (diff) | |
better handling of our different modes and also cherry picking
Diffstat (limited to 'pkg/gui/list_context.go')
| -rw-r--r-- | pkg/gui/list_context.go | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/pkg/gui/list_context.go b/pkg/gui/list_context.go index 80eea1545..f97af7675 100644 --- a/pkg/gui/list_context.go +++ b/pkg/gui/list_context.go @@ -128,7 +128,7 @@ func (lc *ListContext) HandleFocus() error { view.FocusPoint(0, lc.GetPanelState().GetSelectedLineIdx()) - if lc.Gui.inDiffMode() { + if lc.Gui.State.Modes.Diffing.Active() { return lc.Gui.renderDiff() } @@ -403,6 +403,7 @@ func (gui *Gui) subCommitsListContext() *ListContext { RendersToMainView: true, Kind: SIDE_CONTEXT, GetDisplayStrings: func() [][]string { + gui.Log.Warn("getting display strings for sub commits") return presentation.GetCommitListDisplayStrings(gui.State.SubCommits, gui.State.ScreenMode != SCREEN_NORMAL, gui.CherryPickedCommitShaMap(), gui.State.Modes.Diffing.Ref) }, Contains: CONTAINS_COMMITS, |