Yehowshua/ZIm
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Dispatch global actions only once when triggering a menu item

Browse source 
Previously we would dispatch the same global action more than once
because we would invoke `dispatch_action_any` _and_
`dispatch_global_action_any`. However, the former already takes care of
going through the global action handlers when no entity in the dispatch
path handled the action.
This commit is contained in:
Antonio Scandurra 2021-04-14 14:47:18 +02:00
parent 0a2d2aa684
commit f755cbbe98
1 changed files with 5 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

9
gpui/src/app.rs
View file

@ -141,12 +141,13 @@ impl App {
{ {
let presenter = presenter.clone(); let presenter = presenter.clone();
let path = presenter.borrow().dispatch_path(ctx.as_ref()); let path = presenter.borrow().dispatch_path(ctx.as_ref());
if ctx.dispatch_action_any(key_window_id, &path, command, arg.unwrap_or(&())) { ctx.dispatch_action_any(key_window_id, &path, command, arg.unwrap_or(&()));
return; } else {
} ctx.dispatch_global_action_any(command, arg.unwrap_or(&()));
} }
} else {
ctx.dispatch_global_action_any(command, arg.unwrap_or(&()));
} }
ctx.dispatch_global_action_any(command, arg.unwrap_or(&()));
})); }));
app.0.borrow_mut().weak_self = Some(Rc::downgrade(&app.0)); app.0.borrow_mut().weak_self = Some(Rc::downgrade(&app.0));