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

cycle combobox with keybinds

Browse source
This commit is contained in:
Casper Rogild Storm 2023-07-31 22:59:42 +02:00
parent 50ce65b3b7
commit 32a95171d2
1 changed files with 34 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

43
widget/src/combo_box.rs
View file

@ -468,11 +468,13 @@ where
if let Event::Keyboard(keyboard::Event::KeyPressed { if let Event::Keyboard(keyboard::Event::KeyPressed {
key_code, key_code,
modifiers,
.. ..
}) = event }) = event
{ {
match key_code { let shift_modifer = modifiers.shift();
keyboard::KeyCode::Enter => { match (key_code, shift_modifer) {
(keyboard::KeyCode::Enter, _) => {
if let Some(index) = &menu.hovered_option { if let Some(index) = &menu.hovered_option {
if let Some(option) = if let Some(option) =
state.filtered_options.options.get(*index) state.filtered_options.options.get(*index)
@ -483,9 +485,19 @@ where
event_status = event::Status::Captured; event_status = event::Status::Captured;
} }
keyboard::KeyCode::Up => {
(keyboard::KeyCode::Up, _)
| (keyboard::KeyCode::Tab, true) => {
if let Some(index) = &mut menu.hovered_option { if let Some(index) = &mut menu.hovered_option {
*index = index.saturating_sub(1); if *index == 0 {
*index = state
.filtered_options
.options
.len()
.saturating_sub(1);
} else {
*index = index.saturating_sub(1);
}
} else { } else {
menu.hovered_option = Some(0); menu.hovered_option = Some(0);
} }
@ -511,15 +523,28 @@ where
event_status = event::Status::Captured; event_status = event::Status::Captured;
} }
keyboard::KeyCode::Down => { (keyboard::KeyCode::Down, _)
| (keyboard::KeyCode::Tab, false)
if !modifiers.shift() =>
{
if let Some(index) = &mut menu.hovered_option { if let Some(index) = &mut menu.hovered_option {
*index = index.saturating_add(1).min( if *index
state == state
.filtered_options .filtered_options
.options .options
.len() .len()
.saturating_sub(1), .saturating_sub(1)
); {
*index = 0;
} else {
*index = index.saturating_add(1).min(
state
.filtered_options
.options
.len()
.saturating_sub(1),
);
}
} else { } else {
menu.hovered_option = Some(0); menu.hovered_option = Some(0);
} }