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

editor: Hide mouse context menu when modal is opened (#29127)

Browse source 
Closes #28787 

The context menu appears before the modal because it is a Deferred
element, which is always displayed above normal elements.

Release Notes:

Previously, the editor context menu appeared before the Command Palette.
This commit ensures the editor context menu is hidden when a modal,
including the Command Palette, is opened.
This commit is contained in:
redforks 2025-04-21 22:43:26 +08:00 • committed by GitHub
parent 9a3434efb4
commit 6d2bdc3bac
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 84 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

9
crates/workspace/src/modal_layer.rs
View file

@ -1,6 +1,6 @@
use gpui::{
AnyView, DismissEvent, Entity, FocusHandle, Focusable as _, ManagedView, MouseButton,
Subscription,
AnyView, DismissEvent, Entity, EventEmitter, FocusHandle, Focusable as _, ManagedView,
MouseButton, Subscription,
};
use ui::prelude::*;
@ -56,6 +56,10 @@ pub struct ModalLayer {
dismiss_on_focus_lost: bool,
}
pub(crate) struct ModalOpenedEvent;
impl EventEmitter<ModalOpenedEvent> for ModalLayer {}
impl Default for ModalLayer {
fn default() -> Self {
Self::new()
@ -84,6 +88,7 @@ impl ModalLayer {
}
let new_modal = cx.new(|cx| build_view(window, cx));
self.show_modal(new_modal, window, cx);
cx.emit(ModalOpenedEvent);
}
fn show_modal<V>(&mut self, new_modal: Entity<V>, window: &mut Window, cx: &mut Context<Self>)