dan/gpui-component
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

popup_menu: Do not dismiss PopupMenu when clicked on a submenu item. (#921)

Browse source
This commit is contained in:
Jason Lee 2025-06-06 09:25:04 +08:00 committed by GitHub
parent a8f5ced4e6
commit 74de042b60
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 13 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
crates/ui/src/menu/popup_menu.rs
View file

@ -5,13 +5,13 @@ use crate::{
Selectable, Sizable as _, Selectable, Sizable as _,
}; };
use crate::{Kbd, StyledExt}; use crate::{Kbd, StyledExt};
use gpui::Subscription;
use gpui::{ use gpui::{
anchored, canvas, div, prelude::FluentBuilder, px, rems, Action, AnyElement, App, AppContext, anchored, canvas, div, prelude::FluentBuilder, px, rems, Action, AnyElement, App, AppContext,
Bounds, Context, Corner, DismissEvent, Edges, Entity, EventEmitter, FocusHandle, Focusable, Bounds, Context, Corner, DismissEvent, Edges, Entity, EventEmitter, FocusHandle, Focusable,
InteractiveElement, IntoElement, KeyBinding, ParentElement, Pixels, Render, ScrollHandle, InteractiveElement, IntoElement, KeyBinding, ParentElement, Pixels, Render, ScrollHandle,
SharedString, StatefulInteractiveElement, Styled, WeakEntity, Window, SharedString, StatefulInteractiveElement, Styled, WeakEntity, Window,
}; };
use gpui::{MouseDownEvent, Subscription};
use std::cell::Cell; use std::cell::Cell;
use std::ops::Deref; use std::ops::Deref;
use std::rc::Rc; use std::rc::Rc;
@ -883,7 +883,18 @@ impl Render for PopupMenu {
.on_action(cx.listener(Self::select_prev)) .on_action(cx.listener(Self::select_prev))
.on_action(cx.listener(Self::confirm)) .on_action(cx.listener(Self::confirm))
.on_action(cx.listener(Self::dismiss)) .on_action(cx.listener(Self::dismiss))
.on_mouse_down_out(cx.listener(|this, _, window, cx| this.dismiss(&Cancel, window, cx))) .on_mouse_down_out(cx.listener(|this, ev: &MouseDownEvent, window, cx| {
// Do not dismiss, if click inside the parent menu
if let Some(parent) = this.parent_menu.as_ref() {
if let Some(parent) = parent.upgrade() {
if parent.read(cx).bounds.contains(&ev.position) {
return;
}
}
}
this.dismiss(&Cancel, window, cx);
}))
.popover_style(cx) .popover_style(cx)
.text_color(cx.theme().popover_foreground) .text_color(cx.theme().popover_foreground)
.relative() .relative()