Skip to content
This repository has been archived by the owner on Sep 27, 2024. It is now read-only.

fix: content scrolling so it stops at bottom of viewable area instead… #29

Open
wants to merge 6 commits into
base: main
Choose a base branch
from
Open

fix: content scrolling so it stops at bottom of viewable area instead… #29

Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
9f09776
fix: content scrolling so it stops at bottom of viewable area instead…
s9tpepper Apr 21, 2024
824860e
Merge branch 'joshka:main' into main
s9tpepper Apr 27, 2024
2647ddb
test: added scroll_to_bottom test to verify not scrolling past the la…
s9tpepper Apr 27, 2024
7d20f49
chore: fixed clippy hints on unneeded returns
s9tpepper Apr 27, 2024
cb730f2
add more tests for scroll position shenanigans
joshka Jul 18, 2024
533150d
Merge remote-tracking branch 'origin/main' into s9tpepper/main
joshka Jul 18, 2024
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
19 changes: 17 additions & 2 deletions src/scroll_view.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,9 +113,21 @@ impl StatefulWidget for ScrollView {

fn render(self, area: Rect, buf: &mut Buffer, state: &mut Self::State) {
let (mut x, mut y) = state.offset.into();

// ensure that we don't scroll past the end of the buffer in either direction
// also, ensure that the scrolling stops with the end of the content at the
// bottom of the visible area
let max_y_offset = self.size.height - area.height;
let next_y_offset = y.min(self.buf.area.height.saturating_sub(1));
let y_offset = if next_y_offset > max_y_offset {
max_y_offset
} else {
next_y_offset
};

x = x.min(self.buf.area.width.saturating_sub(1));
y = y.min(self.buf.area.height.saturating_sub(1));
y = y.min(y_offset);
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I suspect this can be simplified to:

let min_height = area.height.min(1); // show at least one row
let max_offset = self.size.height.saturating_sub(min_height);
y = y.min(max_offset);


state.offset = (x, y).into();
state.size = Some(self.size);
state.page_size = Some(area.into());
Expand All @@ -137,8 +149,11 @@ impl ScrollView {
}

fn render_vertical_scrollbar(&self, area: Rect, buf: &mut Buffer, state: &ScrollViewState) {
// Subtract height of visible area so the scroll thumb ends at the bottom of the track
let scrollbar_height = self.size.height as usize - area.height as usize;

let mut scrollbar_state =
ScrollbarState::new(self.size.height as usize).position(state.offset.y as usize);
ScrollbarState::new(scrollbar_height).position(state.offset.y as usize);
let scrollbar = Scrollbar::new(ScrollbarOrientation::VerticalRight);
scrollbar.render(area, buf, &mut scrollbar_state);
}
Expand Down