mirrors/zed
1
0
Fork 0
mirror of https://github.com/zed-industries/zed.git synced 2025-01-11 13:10:54 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

💄

Browse source
This commit is contained in:
Antonio Scandurra 2023-05-05 10:53:15 +02:00
parent 080a1f00a3
commit 5e16f70067
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
crates/context_menu/src/context_menu.rs
View file

@ -127,7 +127,7 @@ pub struct ContextMenu {
visible: bool, visible: bool,
previously_focused_view_id: Option<usize>, previously_focused_view_id: Option<usize>,
clicked: bool, clicked: bool,
view_id: usize, parent_view_id: usize,
_actions_observation: Subscription, _actions_observation: Subscription,
} }
@ -177,7 +177,7 @@ impl View for ContextMenu {
} }
impl ContextMenu { impl ContextMenu {
pub fn new(view_id: usize, cx: &mut ViewContext<Self>) -> Self { pub fn new(parent_view_id: usize, cx: &mut ViewContext<Self>) -> Self {
Self { Self {
show_count: 0, show_count: 0,
anchor_position: Default::default(), anchor_position: Default::default(),
@ -188,7 +188,7 @@ impl ContextMenu {
visible: Default::default(), visible: Default::default(),
previously_focused_view_id: Default::default(), previously_focused_view_id: Default::default(),
clicked: false, clicked: false,
view_id, parent_view_id,
_actions_observation: cx.observe_actions(Self::action_dispatched), _actions_observation: cx.observe_actions(Self::action_dispatched),
} }
} }
@ -224,7 +224,7 @@ impl ContextMenu {
match action { match action {
ContextMenuItemAction::Action(action) => { ContextMenuItemAction::Action(action) => {
let window_id = cx.window_id(); let window_id = cx.window_id();
let view_id = self.view_id; let view_id = self.parent_view_id;
let action = action.boxed_clone(); let action = action.boxed_clone();
cx.app_context() cx.app_context()
.spawn(|mut cx| async move { .spawn(|mut cx| async move {
@ -378,7 +378,7 @@ impl ContextMenu {
match action { match action {
ContextMenuItemAction::Action(action) => KeystrokeLabel::new( ContextMenuItemAction::Action(action) => KeystrokeLabel::new(
self.view_id, self.parent_view_id,
action.boxed_clone(), action.boxed_clone(),
style.keystroke.container, style.keystroke.container,
style.keystroke.text.clone(), style.keystroke.text.clone(),
@ -418,7 +418,7 @@ impl ContextMenu {
match item { match item {
ContextMenuItem::Item { label, action } => { ContextMenuItem::Item { label, action } => {
let action = action.clone(); let action = action.clone();
let view_id = self.view_id; let view_id = self.parent_view_id;
MouseEventHandler::<MenuItem, ContextMenu>::new(ix, cx, |state, _| { MouseEventHandler::<MenuItem, ContextMenu>::new(ix, cx, |state, _| {
let style = let style =
style.item.style_for(state, Some(ix) == self.selected_index); style.item.style_for(state, Some(ix) == self.selected_index);