go/lazygit
1
0
Fork 0
mirror of https://github.com/jesseduffield/lazygit.git synced 2025-03-17 21:18:31 +02:00
Code Issues Releases Activity

better way of scrolling to a merge conflict

Browse Source
This commit is contained in:
Jesse Duffield 2021-04-11 10:05:30 +10:00
parent a9fbc9eda1
commit 2d8f7d2a7b
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pkg/gui/merge_panel.go
View File

@ -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)
})