arnekeller/cursive
1
0
Fork 0
mirror of https://github.com/FliegendeWurst/cursive.git synced 2024-11-27 11:16:03 +00:00
Code Issues Projects Releases Wiki Activity

Fix scrollview mouse grab

Browse Source
This commit is contained in:
Alexandre Bury 2018-06-22 13:13:58 -07:00
parent 6ce2dba8a1
commit 3a9ee0df41
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/views/scroll_view.rs
View File

@ -237,12 +237,18 @@ where
fn start_drag(&mut self, position: Vec2) -> bool { fn start_drag(&mut self, position: Vec2) -> bool {
// For each scrollbar, how far it is. // For each scrollbar, how far it is.
let scrollbar_pos = self.last_size.saturating_sub((1, 1)); let scrollbar_pos = self.last_size.saturating_sub((1, 1));
// This is true for Y if we grabbed the vertical scrollbar
let grabbed = scrollbar_pos.zip_map(position, |s, p| s == p).swap();
let lengths = self.scrollbar_thumb_lengths(); let lengths = self.scrollbar_thumb_lengths();
let offsets = self.scrollbar_thumb_offsets(lengths); let offsets = self.scrollbar_thumb_offsets(lengths);
let available = self.available_size();
// This is true for Y if we grabbed the vertical scrollbar
// More specifically, we need both (for instance for the vertical bar):
// * To be in the right column: X == scrollbar_pos
// * To be in the right range: Y < available
let grabbed = position
.zip_map(scrollbar_pos, |p, s| p == s)
.swap()
.and(position.zip_map(available, |p, a| p < a));
// Iterate on axises, and keep the one we grabbed. // Iterate on axises, and keep the one we grabbed.
if let Some((orientation, pos, length, offset)) = if let Some((orientation, pos, length, offset)) =