mirrors/zed
1
0
Fork 0
mirror of https://github.com/zed-industries/zed.git synced 2024-12-27 02:48:34 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Don't steal focus from context menu when dispatching an action

Browse source
This commit is contained in:
Antonio Scandurra 2022-05-30 18:36:36 +02:00
parent f832c0074f
commit 06ab2ace72
1 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -141,10 +141,12 @@ impl ContextMenu {
fn cancel(&mut self, _: &Cancel, cx: &mut ViewContext<Self>) { fn cancel(&mut self, _: &Cancel, cx: &mut ViewContext<Self>) {
self.reset(cx); self.reset(cx);
if cx.handle().is_focused(cx) { cx.defer(|this, cx| {
let window_id = cx.window_id(); if cx.handle().is_focused(cx) {
(**cx).focus(window_id, self.previously_focused_view_id.take()); let window_id = cx.window_id();
} (**cx).focus(window_id, this.previously_focused_view_id.take());
}
});
} }
fn reset(&mut self, cx: &mut ViewContext<Self>) { fn reset(&mut self, cx: &mut ViewContext<Self>) {