From 2d8f7d2a7b9efa2767a4ec00878c8027e267d045 Mon Sep 17 00:00:00 2001 From: Jesse Duffield Date: Sun, 11 Apr 2021 10:05:30 +1000 Subject: [PATCH] better way of scrolling to a merge conflict --- pkg/gui/merge_panel.go | 3 +-- 1 file changed, 1 insertion(+), 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) })