mirrors/zed
1
0
Fork 0
mirror of https://github.com/zed-industries/zed.git synced 2024-11-28 17:58:42 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

Compute dispatch path based on the view id that dispatched the action

Browse source
This commit is contained in:
Antonio Scandurra 2022-05-27 09:59:24 +02:00
parent aedfd74d30
commit 307eb1726c
2 changed files with 21 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
crates/gpui/src/app.rs
View file

@ -1370,7 +1370,10 @@ impl MutableAppContext {
.unwrap() .unwrap()
.0 .0
.clone(); .clone();
let dispatch_path = presenter.borrow().dispatch_path_from(view_id); let mut dispatch_path = Vec::new();
presenter
.borrow()
.compute_dispatch_path_from(view_id, &mut dispatch_path);
for view_id in dispatch_path { for view_id in dispatch_path {
if let Some(view) = self.views.get(&(window_id, view_id)) { if let Some(view) = self.views.get(&(window_id, view_id)) {
let view_type = view.as_any().type_id(); let view_type = view.as_any().type_id();
@ -1424,7 +1427,10 @@ impl MutableAppContext {
.unwrap() .unwrap()
.0 .0
.clone(); .clone();
let dispatch_path = presenter.borrow().dispatch_path_from(view_id); let mut dispatch_path = Vec::new();
presenter
.borrow()
.compute_dispatch_path_from(view_id, &mut dispatch_path);
self.dispatch_action_any(window_id, &dispatch_path, action); self.dispatch_action_any(window_id, &dispatch_path, action);
} }

22
crates/gpui/src/presenter.rs
View file

@ -64,22 +64,20 @@ impl Presenter {
} }
pub fn dispatch_path(&self, app: &AppContext) -> Vec<usize> { pub fn dispatch_path(&self, app: &AppContext) -> Vec<usize> {
let mut path = Vec::new();
if let Some(view_id) = app.focused_view_id(self.window_id) { if let Some(view_id) = app.focused_view_id(self.window_id) {
self.dispatch_path_from(view_id) self.compute_dispatch_path_from(view_id, &mut path)
} else {
Vec::new()
} }
path
} }
pub(crate) fn dispatch_path_from(&self, mut view_id: usize) -> Vec<usize> { pub(crate) fn compute_dispatch_path_from(&self, mut view_id: usize, path: &mut Vec<usize>) {
let mut path = Vec::new();
path.push(view_id); path.push(view_id);
while let Some(parent_id) = self.parents.get(&view_id).copied() { while let Some(parent_id) = self.parents.get(&view_id).copied() {
path.push(parent_id); path.push(parent_id);
view_id = parent_id; view_id = parent_id;
} }
path.reverse(); path.reverse();
path
} }
pub fn invalidate( pub fn invalidate(
@ -329,8 +327,14 @@ impl Presenter {
for view_id in invalidated_views { for view_id in invalidated_views {
cx.notify_view(self.window_id, view_id); cx.notify_view(self.window_id, view_id);
} }
let mut dispatch_path = Vec::new();
for directive in dispatch_directives { for directive in dispatch_directives {
cx.dispatch_action_any(self.window_id, &directive.path, directive.action.as_ref()); dispatch_path.clear();
if let Some(view_id) = directive.dispatcher_view_id {
self.compute_dispatch_path_from(view_id, &mut dispatch_path);
}
cx.dispatch_action_any(self.window_id, &dispatch_path, directive.action.as_ref());
} }
} }
} }
@ -368,7 +372,7 @@ impl Presenter {
} }
pub struct DispatchDirective { pub struct DispatchDirective {
pub path: Vec<usize>, pub dispatcher_view_id: Option<usize>,
pub action: Box<dyn Action>, pub action: Box<dyn Action>,
} }
@ -541,7 +545,7 @@ impl<'a> EventContext<'a> {
pub fn dispatch_any_action(&mut self, action: Box<dyn Action>) { pub fn dispatch_any_action(&mut self, action: Box<dyn Action>) {
self.dispatched_actions.push(DispatchDirective { self.dispatched_actions.push(DispatchDirective {
path: self.view_stack.clone(), dispatcher_view_id: self.view_stack.last().copied(),
action, action,
}); });
} }