leyoda/libcosmic
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix: close context menu on escape press

Browse source
This commit is contained in:
Ashley Wulber 2025-07-22 19:33:07 -04:00 • committed by Ashley Wulber
parent 5aa025af7d
commit 3c13669865
1 changed files with 27 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

28
src/widget/context_menu.rs
View file

@ -11,7 +11,7 @@ use crate::widget::menu::{
}; };
use derive_setters::Setters; use derive_setters::Setters;
use iced::touch::Finger; use iced::touch::Finger;
use iced::{Event, Vector, window}; use iced::{Event, Vector, keyboard, window};
use iced_core::widget::{Tree, Widget, tree}; use iced_core::widget::{Tree, Widget, tree};
use iced_core::{Length, Point, Size, event, mouse, touch}; use iced_core::{Length, Point, Size, event, mouse, touch};
use std::collections::HashSet; use std::collections::HashSet;
@ -31,6 +31,7 @@ pub fn context_menu<'a, Message: 'static + Clone>(
menus, menus,
)] )]
}), }),
close_on_escape: true,
window_id: window::Id::RESERVED, window_id: window::Id::RESERVED,
on_surface_action: None, on_surface_action: None,
}; };
@ -51,6 +52,7 @@ pub struct ContextMenu<'a, Message> {
#[setters(skip)] #[setters(skip)]
context_menu: Option<Vec<menu::Tree<Message>>>, context_menu: Option<Vec<menu::Tree<Message>>>,
pub window_id: window::Id, pub window_id: window::Id,
pub close_on_escape: bool,
#[setters(skip)] #[setters(skip)]
pub(crate) on_surface_action: pub(crate) on_surface_action:
Option<Arc<dyn Fn(crate::surface::Action) -> Message + Send + Sync + 'static>>, Option<Arc<dyn Fn(crate::surface::Action) -> Message + Send + Sync + 'static>>,
@ -344,7 +346,31 @@ impl<Message: 'static + Clone> Widget<Message, crate::Theme, crate::Renderer>
} }
state.open state.open
}); });
if matches!(
event,
Event::Keyboard(keyboard::Event::KeyPressed {
key: keyboard::Key::Named(keyboard::key::Named::Escape),
..
})
) {
state.menu_bar_state.inner.with_data_mut(|state| {
state.menu_states.clear();
state.active_root.clear();
state.open = false;
#[cfg(all(feature = "wayland", feature = "winit", feature = "surface-message"))]
if matches!(WINDOWING_SYSTEM.get(), Some(WindowingSystem::Wayland)) {
if let Some(id) = state.popup_id.remove(&self.window_id) {
{
let surface_action = self.on_surface_action.as_ref().unwrap();
shell
.publish(surface_action(crate::surface::action::destroy_popup(id)));
}
state.view_cursor = cursor;
}
}
});
}
if cursor.is_over(bounds) { if cursor.is_over(bounds) {
let fingers_pressed = state.fingers_pressed.len(); let fingers_pressed = state.fingers_pressed.len();