diff options
| author |  Héctor Ramón <hector@hecrj.dev> | 2024-01-17 08:12:44 +0100 |
|---|---|---|
| committer |  GitHub <noreply@github.com> | 2024-01-17 08:12:44 +0100 |
| commit | 0001a6d63642b299531ff089f961732a1bfa2339 (patch) | |
| tree | 7b100257baf72dbceccf5c3343abf3a6b9f1db03 /widget/src/combo_box.rs | |
| parent | c4ba657de86d7606587dad5124f435141258f570 (diff) | |
| parent | 985acb2b1532b3e56161bd35201c4a2e21a86b85 (diff) | |
| download | iced-0001a6d63642b299531ff089f961732a1bfa2339.tar.gz iced-0001a6d63642b299531ff089f961732a1bfa2339.tar.bz2 iced-0001a6d63642b299531ff089f961732a1bfa2339.zip | |
Merge pull request #2169 from iced-rs/update-winit
Update `winit` to `0.29`
Diffstat (limited to '')
| -rw-r--r-- | widget/src/combo_box.rs | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/widget/src/combo_box.rs b/widget/src/combo_box.rs index 1b2fa947..73beeac3 100644 --- a/widget/src/combo_box.rs +++ b/widget/src/combo_box.rs @@ -1,6 +1,7 @@ //! Display a dropdown list of searchable and selectable options. use crate::core::event::{self, Event}; use crate::core::keyboard; +use crate::core::keyboard::key; use crate::core::layout::{self, Layout}; use crate::core::mouse; use crate::core::overlay; @@ -436,14 +437,14 @@ where } if let Event::Keyboard(keyboard::Event::KeyPressed { - key_code, + key: keyboard::Key::Named(named_key), modifiers, .. }) = event { let shift_modifer = modifiers.shift(); - match (key_code, shift_modifer) { - (keyboard::KeyCode::Enter, _) => { + match (named_key, shift_modifer) { + (key::Named::Enter, _) => { if let Some(index) = &menu.hovered_option { if let Some(option) = state.filtered_options.options.get(*index) @@ -455,8 +456,7 @@ where event_status = event::Status::Captured; } - (keyboard::KeyCode::Up, _) - | (keyboard::KeyCode::Tab, true) => { + (key::Named::ArrowUp, _) | (key::Named::Tab, true) => { if let Some(index) = &mut menu.hovered_option { if *index == 0 { *index = state @@ -492,8 +492,8 @@ where event_status = event::Status::Captured; } - (keyboard::KeyCode::Down, _) - | (keyboard::KeyCode::Tab, false) + (key::Named::ArrowDown, _) + | (key::Named::Tab, false) if !modifiers.shift() => { if let Some(index) = &mut menu.hovered_option { |