me/iced
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Abstract and improve scroll logic in PickList

Browse source
This commit is contained in:
Héctor Ramón Jiménez 2021-07-22 21:15:35 +07:00
parent fbfb28b8d4
commit 6069e90c9b
No known key found for this signature in database
GPG key ID: 140CC052C94F138E
1 changed files with 23 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

50
native/src/widget/pick_list.rs
View file

@ -256,37 +256,33 @@ where
| mouse::ScrollDelta::Pixels { y, .. } => y,
};
if y.is_sign_negative() {
let mut options_iter = self.options.iter();
fn find_next<'a, T: PartialEq>(
selected: &'a T,
mut options: impl Iterator<Item = &'a T>,
) -> Option<&'a T> {
let _ = options.find(|&option| option == selected);
options.next()
}
let next_option = if y < 0.0 {
if let Some(selected) = self.selected.as_ref() {
if let Some(_) =
options_iter.position(|o| o == selected)
{
if let Some(prev_val) = options_iter.next() {
messages
.push((self.on_selected)(prev_val.clone()));
}
}
find_next(selected, self.options.iter())
} else {
messages
.push((self.on_selected)(self.options[0].clone()));
self.options.first()
}
} else if y > 0.0 {
if let Some(selected) = self.selected.as_ref() {
find_next(selected, self.options.iter().rev())
} else {
self.options.last()
}
} else {
let mut options_iter = self.options.iter().rev();
if let Some(selected) = self.selected.as_ref() {
if let Some(_) =
options_iter.position(|o| o == selected)
{
if let Some(next_val) = options_iter.next() {
messages
.push((self.on_selected)(next_val.clone()));
}
}
} else {
messages.push((self.on_selected)(
self.options[self.options.len() - 1].clone(),
));
}
None
};
if let Some(next_option) = next_option {
messages.push((self.on_selected)(next_option.clone()));
}
return event::Status::Captured;