diff options
| author | Jesse Duffield <jessedduffield@gmail.com> | 2019-11-05 14:21:19 +1100 |
|---|---|---|
| committer | Jesse Duffield <jessedduffield@gmail.com> | 2019-11-05 19:22:01 +1100 |
| commit | 6d5d054c30050bc66c9c3e8697982c6c801a2a62 (patch) | |
| tree | 58e08dbfadbfb0af55799e810b1f684e8e1d5527 /pkg/gui/gui.go | |
| parent | 234415537943c090a3f9c3fa3ad7889b6998f9d2 (diff) | |
support line by line additions in staging and patch building contexts
Diffstat (limited to 'pkg/gui/gui.go')
| -rw-r--r-- | pkg/gui/gui.go | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/pkg/gui/gui.go b/pkg/gui/gui.go index 54c85bfe4..43a2478a8 100644 --- a/pkg/gui/gui.go +++ b/pkg/gui/gui.go @@ -82,7 +82,7 @@ type Gui struct { // for now the staging panel state, unlike the other panel states, is going to be // non-mutative, so that we don't accidentally end up // with mismatches of data. We might change this in the future -type stagingPanelState struct { +type lineByLinePanelState struct { SelectedLineIdx int FirstLineIdx int LastLineIdx int @@ -130,7 +130,7 @@ type panelStates struct { Commits *commitPanelState Stash *stashPanelState Menu *menuPanelState - Staging *stagingPanelState + LineByLine *lineByLinePanelState Merging *mergingPanelState CommitFiles *commitFilesPanelState } @@ -391,7 +391,7 @@ func (gui *Gui) layout(g *gocui.Gui) error { main := "main" secondary := "secondary" - swappingMainPanels := gui.State.Panels.Staging != nil && gui.State.Panels.Staging.SecondaryFocused + swappingMainPanels := gui.State.Panels.LineByLine != nil && gui.State.Panels.LineByLine.SecondaryFocused if swappingMainPanels { main = "secondary" secondary = "main" |