fix(menu): overlays should be used when multi-window is not active

src/widget/menu/menu_bar.rs

@@ -9,7 +9,12 @@ use super::{
     },
     menu_tree::MenuTree,
 };
-#[cfg(all(feature = "wayland", feature = "winit", feature = "surface-message"))]
+#[cfg(all(
+    feature = "multi-window",
+    feature = "wayland",
+    feature = "winit",
+    feature = "surface-message"
+))]
 use crate::app::cosmic::{WINDOWING_SYSTEM, WindowingSystem};
 use crate::{
     Renderer,
@@ -190,7 +195,7 @@ pub struct MenuBar<Message> {
     menu_roots: Vec<MenuTree<Message>>,
     style: <crate::Theme as StyleSheet>::Style,
     window_id: window::Id,
-    #[cfg(all(feature = "wayland", feature = "winit"))]
+    #[cfg(all(feature = "multi-window", feature = "wayland", feature = "winit"))]
     positioner: iced_runtime::platform_specific::wayland::popup::SctkPositioner,
     pub(crate) on_surface_action:
         Option<Arc<dyn Fn(crate::surface::Action) -> Message + Send + Sync + 'static>>,
@@ -225,7 +230,7 @@ where
             menu_roots,
             style: <crate::Theme as StyleSheet>::Style::default(),
             window_id: window::Id::NONE,
-            #[cfg(all(feature = "wayland", feature = "winit"))]
+            #[cfg(all(feature = "multi-window", feature = "wayland", feature = "winit"))]
             positioner: iced_runtime::platform_specific::wayland::popup::SctkPositioner::default(),
             on_surface_action: None,
         }
@@ -319,7 +324,7 @@ where
         self
     }
 
-    #[cfg(all(feature = "wayland", feature = "winit"))]
+    #[cfg(all(feature = "multi-window", feature = "wayland", feature = "winit"))]
     pub fn with_positioner(
         mut self,
         positioner: iced_runtime::platform_specific::wayland::popup::SctkPositioner,
@@ -351,7 +356,12 @@ where
         self
     }
 
-    #[cfg(all(feature = "wayland", feature = "winit", feature = "surface-message"))]
+    #[cfg(all(
+        feature = "multi-window",
+        feature = "wayland",
+        feature = "winit",
+        feature = "surface-message"
+    ))]
     #[allow(clippy::too_many_lines)]
     fn create_popup(
         &mut self,
@@ -630,7 +640,12 @@ where
                 if !create_popup {
                     return event::Status::Ignored;
                 }
-                #[cfg(all(feature = "wayland", feature = "winit", feature = "surface-message"))]
+                #[cfg(all(
+                    feature = "multi-window",
+                    feature = "wayland",
+                    feature = "winit",
+                    feature = "surface-message"
+                ))]
                 if matches!(WINDOWING_SYSTEM.get(), Some(WindowingSystem::Wayland)) {
                     self.create_popup(layout, view_cursor, renderer, shell, viewport, my_state);
                 }
@@ -638,7 +653,12 @@ where
             Mouse(mouse::Event::CursorMoved { .. } | mouse::Event::CursorEntered)
                 if open && view_cursor.is_over(layout.bounds()) =>
             {
-                #[cfg(all(feature = "wayland", feature = "winit", feature = "surface-message"))]
+                #[cfg(all(
+                    feature = "multi-window",
+                    feature = "wayland",
+                    feature = "winit",
+                    feature = "surface-message"
+                ))]
                 if matches!(WINDOWING_SYSTEM.get(), Some(WindowingSystem::Wayland)) {
                     self.create_popup(layout, view_cursor, renderer, shell, viewport, my_state);
                 }
@@ -715,7 +735,12 @@ where
         _renderer: &Renderer,
         translation: Vector,
     ) -> Option<overlay::Element<'b, Message, crate::Theme, Renderer>> {
-        #[cfg(all(feature = "wayland", feature = "winit", feature = "surface-message"))]
+        #[cfg(all(
+            feature = "multi-window",
+            feature = "wayland",
+            feature = "winit",
+            feature = "surface-message"
+        ))]
         if matches!(WINDOWING_SYSTEM.get(), Some(WindowingSystem::Wayland))
             && self.on_surface_action.is_some()
             && self.window_id != window::Id::NONE

src/widget/menu/menu_inner.rs

@@ -4,7 +4,12 @@
 use std::{borrow::Cow, sync::Arc};
 
 use super::{menu_bar::MenuBarState, menu_tree::MenuTree};
-#[cfg(all(feature = "wayland", feature = "winit", feature = "surface-message"))]
+#[cfg(all(
+    feature = "multi-window",
+    feature = "wayland",
+    feature = "winit",
+    feature = "surface-message"
+))]
 use crate::app::cosmic::{WINDOWING_SYSTEM, WindowingSystem};
 use crate::style::menu_bar::StyleSheet;
 
@@ -663,6 +668,7 @@ impl<'b, Message: Clone + 'static> Menu<'b, Message> {
 
                         if needs_reset {
                             #[cfg(all(
+                                feature = "multi-window",
                                 feature = "wayland",
                                 feature = "winit",
                                 feature = "surface-message"
@@ -932,7 +938,12 @@ impl<Message: std::clone::Clone + 'static> Widget<Message, crate::Theme, crate::
     ) -> event::Status {
         let (new_root, status) = self.on_event(event, layout, cursor, renderer, clipboard, shell);
 
-        #[cfg(all(feature = "wayland", feature = "winit", feature = "surface-message"))]
+        #[cfg(all(
+            feature = "multi-window",
+            feature = "wayland",
+            feature = "winit",
+            feature = "surface-message"
+        ))]
         if matches!(WINDOWING_SYSTEM.get(), Some(WindowingSystem::Wayland)) {
             if let Some((new_root, new_ms)) = new_root {
                 use iced_runtime::platform_specific::wayland::popup::{
@@ -1177,7 +1188,12 @@ pub(crate) fn init_root_menu<Message: Clone>(
     });
 }
 
-#[cfg(all(feature = "wayland", feature = "winit", feature = "surface-message"))]
+#[cfg(all(
+    feature = "multi-window",
+    feature = "wayland",
+    feature = "winit",
+    feature = "surface-message"
+))]
 pub(super) fn init_root_popup_menu<Message>(
     menu: &mut Menu<'_, Message>,
     renderer: &crate::Renderer,
@@ -1474,7 +1490,7 @@ where
             .as_ref()
             .is_some_and(|i| *i != new_index && !active_menu[*i].children.is_empty());
 
-        #[cfg(all(feature = "wayland", feature = "winit", feature = "surface-message"))]
+        #[cfg(all(feature = "multi-window", feature = "wayland", feature = "winit", feature = "surface-message"))]
         if matches!(WINDOWING_SYSTEM.get(), Some(WindowingSystem::Wayland)) && remove {
             if let Some(id) = state.popup_id.remove(&menu.window_id) {
                 state.active_root.truncate(menu.depth + 1);