Skip to content

fix(menu-bar): exit early from popup creation if no root is hovered #892

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
wash2 merged 2 commits into from
Jun 10, 2025
Merged

fix(menu-bar): exit early from popup creation if no root is hovered #892

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6ef4479
fix(menu-bar): exit early from popup creation if no root is hovered
wash2 Jun 10, 2025
be4a52b
fix(button): return from draw if there is no content layout
wash2 Jun 10, 2025
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
2 changes: 1 addition & 1 deletion iced
Open in desktop
Submodule iced updated 3 files
+10 −0 winit/src/platform_specific/mod.rs
+7 −0 winit/src/platform_specific/wayland/mod.rs
+8 −0 winit/src/program.rs
6 changes: 5 additions & 1 deletion src/widget/button/widget.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -437,7 +437,11 @@ impl<'a, Message: 'a + Clone> Widget<Message, crate::Theme, crate::Renderer>
if !viewport.intersects(&bounds) {
return;
}
let content_layout = layout.children().next().unwrap();

// FIXME: Why is there no content layout
let Some(content_layout) = layout.children().next() else {
return;
};

let mut headerbar_alpha = None;

Expand Down
9 changes: 5 additions & 4 deletions src/widget/menu/menu_bar.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -375,13 +375,14 @@ where
let hovered_root = layout
.children()
.position(|lo| view_cursor.is_over(lo.bounds()));

if old_active_root
.zip(hovered_root)
.is_some_and(|r| r.0 == r.1)
if hovered_root.is_none()
|| old_active_root
.zip(hovered_root)
.is_some_and(|r| r.0 == r.1)
{
return;
}

let (id, root_list) = my_state.inner.with_data_mut(|state| {
if let Some(id) = state.popup_id.get(&self.window_id).copied() {
// close existing popups
Expand Down
Loading