mirrors/zed
1
0
Fork 0
mirror of https://github.com/zed-industries/zed.git synced 2025-01-24 02:46:43 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 12

Don't dismiss context menu when right-clicking project panel again

Browse source
This commit is contained in:
Antonio Scandurra 2022-06-02 09:50:05 +02:00
parent 701e2090cd
commit 12267308e4
1 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -50,6 +50,7 @@ impl ContextMenuItem {
} }
pub struct ContextMenu { pub struct ContextMenu {
show_count: usize,
position: Vector2F, position: Vector2F,
items: Vec<ContextMenuItem>, items: Vec<ContextMenuItem>,
selected_index: Option<usize>, selected_index: Option<usize>,
@ -106,6 +107,7 @@ impl View for ContextMenu {
impl ContextMenu { impl ContextMenu {
pub fn new(cx: &mut ViewContext<Self>) -> Self { pub fn new(cx: &mut ViewContext<Self>) -> Self {
Self { Self {
show_count: 0,
position: Default::default(), position: Default::default(),
items: Default::default(), items: Default::default(),
selected_index: Default::default(), selected_index: Default::default(),
@ -143,8 +145,9 @@ 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);
cx.defer(|this, cx| { let show_count = self.show_count;
if cx.handle().is_focused(cx) { cx.defer(move |this, cx| {
if cx.handle().is_focused(cx) && this.show_count == show_count {
let window_id = cx.window_id(); let window_id = cx.window_id();
(**cx).focus(window_id, this.previously_focused_view_id.take()); (**cx).focus(window_id, this.previously_focused_view_id.take());
} }
@ -212,6 +215,7 @@ impl ContextMenu {
self.items = items.collect(); self.items = items.collect();
self.position = position; self.position = position;
self.visible = true; self.visible = true;
self.show_count += 1;
if !cx.is_self_focused() { if !cx.is_self_focused() {
self.previously_focused_view_id = cx.focused_view_id(cx.window_id()); self.previously_focused_view_id = cx.focused_view_id(cx.window_id());
} }