reya/coop
1
0
Fork 0
Code Issues Pull Requests Releases Activity

chore: bump edition from 2021 to 2024

Browse Source
This commit is contained in:
Ren Amamiya
2026-03-13 09:13:04 +07:00
parent aa26c9ccba
commit 1d57a2deab
21 changed files with 250 additions and 244 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
crates/ui/src/menu/popup_menu.rs
View File

@@ -719,13 +719,13 @@ impl PopupMenu {
}
pub(crate) fn active_submenu(&self) -> Option<Entity<PopupMenu>> {
if let Some(ix) = self.selected_index {
if let Some(item) = self.menu_items.get(ix) {
return match item {
PopupMenuItem::Submenu { menu, .. } => Some(menu.clone()),
_ => None,
};
}
if let Some(ix) = self.selected_index
&& let Some(item) = self.menu_items.get(ix)
{
return match item {
PopupMenuItem::Submenu { menu, .. } => Some(menu.clone()),
_ => None,
};
}
None
@@ -965,12 +965,11 @@ impl PopupMenu {
cx: &mut Context<Self>,
) {
// Do not dismiss, if click inside the parent menu
if let Some(parent) = self.parent_menu.as_ref() {
if let Some(parent) = parent.upgrade() {
if parent.read(cx).bounds.contains(position) {
return;
}
}
if let Some(parent) = self.parent_menu.as_ref()
&& let Some(parent) = parent.upgrade()
&& parent.read(cx).bounds.contains(position)
{
return;
}
self.dismiss(&Cancel, window, cx);