Skip to content

Commit

Permalink
Fix scrolloff at view bottom (#6142)
Browse files Browse the repository at this point in the history
Fixes a regression introduced in #5420 where a scrolloff of `x - 1`
was used instead if `x` at the bottom of the screen. This was
especially problematic if the scrolloff was set to `0` in that case
the scrolloff behaved as tough set to `-1` and the cursor disappeared
from the view if scrolled to the botoom.
  • Loading branch information
pascalkuthe committed Mar 3, 2023
1 parent 2d5577d commit 5c716af
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions helix-view/src/view.rs
Original file line number Diff line number Diff line change
Expand Up @@ -242,7 +242,7 @@ impl View {
at_top = true;
true
}
Some((visual_pos, _)) if visual_pos.row >= vertical_viewport_end - scrolloff => {
Some((visual_pos, _)) if visual_pos.row + scrolloff + 1 >= vertical_viewport_end => {
if CENTERING && visual_pos.row >= vertical_viewport_end {
// cursor out of view
return None;
Expand All @@ -257,7 +257,7 @@ impl View {
let v_off = if at_top {
scrolloff as isize
} else {
viewport.height as isize - scrolloff as isize
viewport.height as isize - scrolloff as isize - 1
};
(offset.anchor, offset.vertical_offset) =
char_idx_at_visual_offset(doc_text, cursor, -v_off, 0, &text_fmt, &annotations);
Expand Down

0 comments on commit 5c716af

Please sign in to comment.