Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Simplify edge calculation when scrolling down #1194

Merged
merged 4 commits into from
Apr 9, 2023
+7 −5
Merged

Simplify edge calculation when scrolling down #1194

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
14f18e7
Simplify edge calculation when scrolling down
joelim-work Apr 4, 2023
0404e23
Merge branch 'master' into simplify-edge-calc
joelim-work Apr 9, 2023
5e97a28
Alternate implementation
joelim-work Apr 9, 2023
a2e9d3b
Alternate implementation #2
joelim-work Apr 9, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 7 additions & 5 deletions nav.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -925,11 +925,13 @@ func (nav *nav) down(dist int) bool {
dir.ind = min(maxind, dir.ind)

dir.pos += dist
edge := min(min(nav.height/2, gOpts.scrolloff), maxind-dir.ind)

// use a smaller value when the height is even and scrolloff is maxed
// in order to stay at the same row as much as possible while up/down
edge = min(edge, nav.height/2+nav.height%2-1)
// use a smaller value for half when the height is even and scrolloff is
// maxed in order to stay at the same row while scrolling up and down
half := nav.height / 2
if nav.height%2 == 0 {
half--
}
edge := min(min(half, gOpts.scrolloff), maxind-dir.ind)

dir.pos = min(dir.pos, nav.height-edge-1)
dir.pos = min(dir.pos, maxind)
Expand Down