feat(keyboard-nav): add Escape and Search messages
This commit is contained in:
parent
ff1de78aa8
commit
f81a06bc4a
2 changed files with 33 additions and 2 deletions
|
|
@ -406,6 +406,7 @@ impl Application for Window {
|
||||||
keyboard_nav::Message::Unfocus => ret = keyboard_nav::unfocus(),
|
keyboard_nav::Message::Unfocus => ret = keyboard_nav::unfocus(),
|
||||||
keyboard_nav::Message::FocusNext => ret = widget::focus_next(),
|
keyboard_nav::Message::FocusNext => ret = widget::focus_next(),
|
||||||
keyboard_nav::Message::FocusPrevious => ret = widget::focus_previous(),
|
keyboard_nav::Message::FocusPrevious => ret = widget::focus_previous(),
|
||||||
|
_ => (),
|
||||||
},
|
},
|
||||||
Message::ToggleWarning => self.toggle_warning(),
|
Message::ToggleWarning => self.toggle_warning(),
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -1,19 +1,26 @@
|
||||||
use iced::{event, keyboard, mouse, subscription, Command, Event, Subscription};
|
use iced::{
|
||||||
|
event,
|
||||||
|
keyboard::{self, KeyCode},
|
||||||
|
mouse, subscription, Command, Event, Subscription,
|
||||||
|
};
|
||||||
use iced_native::widget::{operation, Id, Operation};
|
use iced_native::widget::{operation, Id, Operation};
|
||||||
|
|
||||||
#[derive(Clone, Copy, Debug, PartialEq, Eq, Hash)]
|
#[derive(Clone, Copy, Debug, PartialEq, Eq, Hash)]
|
||||||
pub enum Message {
|
pub enum Message {
|
||||||
|
Escape,
|
||||||
FocusNext,
|
FocusNext,
|
||||||
FocusPrevious,
|
FocusPrevious,
|
||||||
Unfocus,
|
Unfocus,
|
||||||
|
Search,
|
||||||
}
|
}
|
||||||
|
|
||||||
#[must_use]
|
#[must_use]
|
||||||
pub fn subscription() -> Subscription<Message> {
|
pub fn subscription() -> Subscription<Message> {
|
||||||
subscription::events_with(|event, status| match (event, status) {
|
subscription::events_with(|event, status| match (event, status) {
|
||||||
|
// Focus
|
||||||
(
|
(
|
||||||
Event::Keyboard(keyboard::Event::KeyPressed {
|
Event::Keyboard(keyboard::Event::KeyPressed {
|
||||||
key_code: keyboard::KeyCode::Tab,
|
key_code: KeyCode::Tab,
|
||||||
modifiers,
|
modifiers,
|
||||||
..
|
..
|
||||||
}),
|
}),
|
||||||
|
|
@ -23,6 +30,29 @@ pub fn subscription() -> Subscription<Message> {
|
||||||
} else {
|
} else {
|
||||||
Message::FocusNext
|
Message::FocusNext
|
||||||
}),
|
}),
|
||||||
|
// Escape
|
||||||
|
(
|
||||||
|
Event::Keyboard(keyboard::Event::KeyPressed {
|
||||||
|
key_code: KeyCode::Escape,
|
||||||
|
..
|
||||||
|
}),
|
||||||
|
_,
|
||||||
|
) => Some(Message::Escape),
|
||||||
|
// Search
|
||||||
|
(
|
||||||
|
Event::Keyboard(keyboard::Event::KeyPressed {
|
||||||
|
key_code: KeyCode::F,
|
||||||
|
modifiers,
|
||||||
|
}),
|
||||||
|
event::Status::Ignored,
|
||||||
|
) => {
|
||||||
|
if modifiers.control() {
|
||||||
|
Some(Message::Search)
|
||||||
|
} else {
|
||||||
|
None
|
||||||
|
}
|
||||||
|
}
|
||||||
|
// Unfocus
|
||||||
(Event::Mouse(mouse::Event::ButtonPressed { .. }), event::Status::Ignored) => {
|
(Event::Mouse(mouse::Event::ButtonPressed { .. }), event::Status::Ignored) => {
|
||||||
Some(Message::Unfocus)
|
Some(Message::Unfocus)
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue