mirrors/zed
1
0
Fork 0
mirror of https://github.com/zed-industries/zed.git synced 2025-01-27 12:54:42 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Allow context menu to be cancelled after deploying it twice

Browse source 
Previously, two right clicks would cause an issue with cancelling the context menu via escape.
This commit is contained in:
Nathan Sobo 2022-05-27 12:00:11 -06:00
parent c3baf2748f
commit 9909fc529b
2 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -169,7 +169,9 @@ impl ContextMenu {
self.items = items.collect(); self.items = items.collect();
self.position = position; self.position = position;
self.visible = true; self.visible = true;
self.previously_focused_view_id = cx.focused_view_id(cx.window_id()); if !cx.is_self_focused() {
self.previously_focused_view_id = cx.focused_view_id(cx.window_id());
}
cx.focus_self(); cx.focus_self();
} else { } else {
self.visible = false; self.visible = false;

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

@ -3255,6 +3255,10 @@ impl<'a, T: View> ViewContext<'a, T> {
self.app.focus(self.window_id, Some(self.view_id)); self.app.focus(self.window_id, Some(self.view_id));
} }
pub fn is_self_focused(&self) -> bool {
self.app.focused_view_id(self.window_id) == Some(self.view_id)
}
pub fn blur(&mut self) { pub fn blur(&mut self) {
self.app.focus(self.window_id, None); self.app.focus(self.window_id, None);
} }