mirror of
https://github.com/jesseduffield/lazygit.git
synced 2024-12-14 11:23:09 +02:00
79c11a0458
Previously, the current line was only moved as much as necessary so that it's in view again. This had the problem that when jumping downwards from hunk to hunk with the right-arrow key, only the first line of the new hunk was shown at the bottom of the window. I prefer to put the selected line in the middle of the view in this case, so that I can see more of the newly selected hunk. This has the consequence that when scrolling through the view line by line using down-arrow, the view jumps by half a screen whenever I reach the bottom. I can see how some users might be opposed to this change, but I happen to like it too, because it allows me to see more context of what's ahead.
52 lines
1.8 KiB
Go
52 lines
1.8 KiB
Go
package patch_exploring
|
|
|
|
import "github.com/jesseduffield/lazygit/pkg/utils"
|
|
|
|
func calculateOrigin(currentOrigin int, bufferHeight int, numLines int, firstLineIdx int, lastLineIdx int, selectedLineIdx int, mode selectMode) int {
|
|
needToSeeIdx, wantToSeeIdx := getNeedAndWantLineIdx(firstLineIdx, lastLineIdx, selectedLineIdx, mode)
|
|
|
|
return calculateNewOriginWithNeededAndWantedIdx(currentOrigin, bufferHeight, numLines, needToSeeIdx, wantToSeeIdx)
|
|
}
|
|
|
|
// we want to scroll our origin so that the index we need to see is in view
|
|
// and the other index we want to see (e.g. the other side of a line range)
|
|
// is as close to being in view as possible.
|
|
func calculateNewOriginWithNeededAndWantedIdx(currentOrigin int, bufferHeight int, numLines int, needToSeeIdx int, wantToSeeIdx int) int {
|
|
origin := currentOrigin
|
|
if needToSeeIdx < currentOrigin || needToSeeIdx > currentOrigin+bufferHeight {
|
|
origin = utils.Max(utils.Min(needToSeeIdx-bufferHeight/2, numLines-bufferHeight-1), 0)
|
|
}
|
|
|
|
bottom := origin + bufferHeight
|
|
|
|
if wantToSeeIdx < origin {
|
|
requiredChange := origin - wantToSeeIdx
|
|
allowedChange := bottom - needToSeeIdx
|
|
return origin - utils.Min(requiredChange, allowedChange)
|
|
} else if wantToSeeIdx > origin+bufferHeight {
|
|
requiredChange := wantToSeeIdx - bottom
|
|
allowedChange := needToSeeIdx - origin
|
|
return origin + utils.Min(requiredChange, allowedChange)
|
|
} else {
|
|
return origin
|
|
}
|
|
}
|
|
|
|
func getNeedAndWantLineIdx(firstLineIdx int, lastLineIdx int, selectedLineIdx int, mode selectMode) (int, int) {
|
|
switch mode {
|
|
case LINE:
|
|
return selectedLineIdx, selectedLineIdx
|
|
case RANGE:
|
|
if selectedLineIdx == firstLineIdx {
|
|
return firstLineIdx, lastLineIdx
|
|
} else {
|
|
return lastLineIdx, firstLineIdx
|
|
}
|
|
case HUNK:
|
|
return firstLineIdx, lastLineIdx
|
|
default:
|
|
// we should never land here
|
|
panic("unknown mode")
|
|
}
|
|
}
|