mirror of
https://github.com/zed-industries/zed.git
synced 2024-11-07 20:39:04 +03:00
commit
45992b0d63
@ -1497,10 +1497,13 @@ impl<'a> WindowContext<'a> {
|
||||
}
|
||||
|
||||
pub fn bindings_for_action(&self, action: &dyn Action) -> Vec<KeyBinding> {
|
||||
self.window.current_frame.dispatch_tree.bindings_for_action(
|
||||
action,
|
||||
&self.window.current_frame.dispatch_tree.context_stack,
|
||||
)
|
||||
self.window
|
||||
.previous_frame
|
||||
.dispatch_tree
|
||||
.bindings_for_action(
|
||||
action,
|
||||
&self.window.previous_frame.dispatch_tree.context_stack,
|
||||
)
|
||||
}
|
||||
|
||||
pub fn bindings_for_action_in(
|
||||
|
@ -24,6 +24,7 @@ pub struct ContextMenu {
|
||||
items: Vec<ContextMenuItem>,
|
||||
focus_handle: FocusHandle,
|
||||
selected_index: Option<usize>,
|
||||
delayed: bool,
|
||||
}
|
||||
|
||||
impl FocusableView for ContextMenu {
|
||||
@ -46,6 +47,7 @@ impl ContextMenu {
|
||||
items: Default::default(),
|
||||
focus_handle: cx.focus_handle(),
|
||||
selected_index: None,
|
||||
delayed: false,
|
||||
},
|
||||
cx,
|
||||
)
|
||||
@ -165,6 +167,7 @@ impl ContextMenu {
|
||||
}
|
||||
}) {
|
||||
self.selected_index = Some(ix);
|
||||
self.delayed = true;
|
||||
cx.notify();
|
||||
let action = dispatched.boxed_clone();
|
||||
cx.spawn(|this, mut cx| async move {
|
||||
@ -205,7 +208,7 @@ impl Render for ContextMenu {
|
||||
.on_action(cx.listener(ContextMenu::select_prev))
|
||||
.on_action(cx.listener(ContextMenu::confirm))
|
||||
.on_action(cx.listener(ContextMenu::cancel))
|
||||
.map(|mut el| {
|
||||
.when(!self.delayed, |mut el| {
|
||||
for item in self.items.iter() {
|
||||
if let ContextMenuItem::Entry {
|
||||
action: Some(action),
|
||||
|
Loading…
Reference in New Issue
Block a user