Skip to content

only listen for Escape while it can close a menu #896

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
romanstingler wants to merge 1 commit into
base: main
Choose a base branch
from
Open

only listen for Escape while it can close a menu #896

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 18 additions & 11 deletions src/app.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -715,18 +715,25 @@ impl App {
_ => Message::None,
}),
iced::output_events().map(Message::OutputEvent),
listen_with(move |evt, _, _| match evt {
iced::event::Event::Keyboard(keyboard::Event::KeyPressed { key, .. }) => {
debug!("Keyboard event received: {key:?}");
if matches!(key, keyboard::Key::Named(keyboard::key::Named::Escape)) {
debug!("ESC key pressed, closing all menus");
Some(Message::CloseAllMenus)
} else {
None
// Only listen while Escape can close a menu; an idle listener
// subscription still receives every interaction event and would
// overflow iced's fixed-size event channel for nothing.
if self.general_config.enable_esc_key && self.outputs.menu_is_open() {
listen_with(|evt, _, _| match evt {
iced::event::Event::Keyboard(keyboard::Event::KeyPressed { key, .. }) => {
debug!("Keyboard event received: {key:?}");
if matches!(key, keyboard::Key::Named(keyboard::key::Named::Escape)) {
debug!("ESC key pressed, closing all menus");
Some(Message::CloseAllMenus)
} else {
None
}
}
}
_ => None,
}),
_ => None,
})
} else {
Subscription::none()
},
Subscription::run(|| match signal_hook_tokio::Signals::new([libc::SIGUSR1]) {
Ok(signals) => signals
.filter_map(|sig| {
Expand Down