From 2e308d8d26870a805af00dbf5ddbd1d7be0e75e4 Mon Sep 17 00:00:00 2001 From: Alexandre Bury Date: Sun, 5 Jul 2020 15:29:30 -0700 Subject: [PATCH] Fix bad scrolling detection --- cursive-core/src/view/scroll/raw.rs | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/cursive-core/src/view/scroll/raw.rs b/cursive-core/src/view/scroll/raw.rs index 1ed0aba..c74e087 100644 --- a/cursive-core/src/view/scroll/raw.rs +++ b/cursive-core/src/view/scroll/raw.rs @@ -69,12 +69,15 @@ where size }; + // Re-define `available` using the new, actual size. + let available = size.saturating_sub(scrollbar_size); + // On non-scrolling axis, give inner_size the available space instead. let inner_size = get_scroller(model) .is_enabled() - .select_or(inner_size, size.saturating_sub(scrollbar_size)); + .select_or(inner_size, available); - let new_scrolling = inner_size.zip_map(size, |i, s| i > s); + let new_scrolling = inner_size.zip_map(available, |i, s| i > s); (inner_size, size, new_scrolling) }