diff options
| author | Jesse Duffield <jessedduffield@gmail.com> | 2021-04-11 10:05:30 +1000 |
|---|---|---|
| committer | Jesse Duffield <jessedduffield@gmail.com> | 2021-04-11 10:21:53 +1000 |
| commit | 2d8f7d2a7b9efa2767a4ec00878c8027e267d045 (patch) | |
| tree | f609c3b6549916cb2c12414d4a9c1d3e4cbb8c2d /pkg/gui | |
| parent | a9fbc9eda1da207d798d8e2e95dff8dcc5546cbf (diff) | |
better way of scrolling to a merge conflict
Diffstat (limited to 'pkg/gui')
| -rw-r--r-- | pkg/gui/merge_panel.go | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/pkg/gui/merge_panel.go b/pkg/gui/merge_panel.go index a3a6ee4cf..556f20cc0 100644 --- a/pkg/gui/merge_panel.go +++ b/pkg/gui/merge_panel.go @@ -241,8 +241,7 @@ func (gui *Gui) scrollToConflict() error { conflict := panelState.Conflicts[panelState.ConflictIndex] ox, _ := mergingView.Origin() _, height := mergingView.Size() - conflictMiddle := (conflict.End + conflict.Start) / 2 - newOriginY := int(math.Max(0, float64(conflictMiddle-(height/2)))) + newOriginY := int(math.Max(0, float64(conflict.Middle-(height/2)))) gui.g.Update(func(g *gocui.Gui) error { return mergingView.SetOrigin(ox, newOriginY) }) |