Skip to content

ui: Dismiss context menus when window loses focus #46866

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
danilo-leal merged 2 commits into from
Jan 15, 2026
Merged

ui: Dismiss context menus when window loses focus #46866

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c3e8435
Dismiss context menus when window loses focus
notnotjake Jan 15, 2026
2f8a767
Format
danilo-leal Jan 15, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 30 additions & 0 deletions crates/ui/src/components/context_menu.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -220,6 +220,7 @@ pub struct ContextMenu {
end_slot_action: Option<Box<dyn Action>>,
key_context: SharedString,
_on_blur_subscription: Subscription,
_on_window_deactivate_subscription: Subscription,
keep_open_on_confirm: bool,
fixed_width: Option<DefiniteLength>,
main_menu: Option<Entity<ContextMenu>>,
Expand Down Expand Up @@ -295,6 +296,12 @@ impl ContextMenu {
this.cancel(&menu::Cancel, window, cx)
},
);
let _on_window_deactivate_subscription =
cx.observe_window_activation(window, |this: &mut ContextMenu, window, cx| {
if !window.is_window_active() {
this.cancel(&menu::Cancel, window, cx);
}
});
window.refresh();

f(
Expand All @@ -309,6 +316,7 @@ impl ContextMenu {
end_slot_action: None,
key_context: "menu".into(),
_on_blur_subscription,
_on_window_deactivate_subscription,
keep_open_on_confirm: false,
fixed_width: None,
main_menu: None,
Expand Down Expand Up @@ -372,6 +380,12 @@ impl ContextMenu {
this.cancel(&menu::Cancel, window, cx)
},
);
let _on_window_deactivate_subscription =
cx.observe_window_activation(window, |this: &mut ContextMenu, window, cx| {
if !window.is_window_active() {
this.cancel(&menu::Cancel, window, cx);
}
});
window.refresh();

(builder.clone())(
Expand All @@ -386,6 +400,7 @@ impl ContextMenu {
end_slot_action: None,
key_context: "menu".into(),
_on_blur_subscription,
_on_window_deactivate_subscription,
keep_open_on_confirm: true,
fixed_width: None,
main_menu: None,
Expand Down Expand Up @@ -455,6 +470,14 @@ impl ContextMenu {
this.cancel(&menu::Cancel, window, cx)
},
),
_on_window_deactivate_subscription: cx.observe_window_activation(
window,
|this: &mut ContextMenu, window, cx| {
if !window.is_window_active() {
this.cancel(&menu::Cancel, window, cx);
}
},
),
keep_open_on_confirm: false,
fixed_width: None,
main_menu: None,
Expand Down Expand Up @@ -1206,6 +1229,12 @@ impl ContextMenu {
window,
|_this: &mut ContextMenu, _window, _cx| {},
);
let _on_window_deactivate_subscription =
cx.observe_window_activation(window, |this: &mut ContextMenu, window, cx| {
if !window.is_window_active() {
this.cancel(&menu::Cancel, window, cx);
}
});

let mut menu = ContextMenu {
builder: None,
Expand All @@ -1218,6 +1247,7 @@ impl ContextMenu {
end_slot_action: None,
key_context: "menu".into(),
_on_blur_subscription,
_on_window_deactivate_subscription,
keep_open_on_confirm: false,
fixed_width: None,
documentation_aside: None,
Expand Down