fix: conditional features and tests

examples/applet/src/window.rs

@@ -6,7 +6,7 @@ use cosmic::iced::{self, Length, Limits, Task};
 use cosmic::iced_runtime::core::window;
 use cosmic::iced_runtime::platform_specific::wayland::popup::SctkPopupSettings;
 use cosmic::iced_runtime::platform_specific::wayland::subsurface;
-use cosmic::surface_message::{MessageWrapper, SurfaceMessage};
+use cosmic::surface::{MessageWrapper, SurfaceMessage};
 use cosmic::widget::dropdown::DropdownView;
 use cosmic::widget::{autosize, dropdown, layer_container, list_column, settings, toggler};
 use cosmic::{iced_core, Element};

examples/nav-context/src/main.rs

@@ -70,10 +70,10 @@ pub enum NavMenuAction {
 }
 
 impl menu::Action for NavMenuAction {
-    type Message = cosmic::app::Message<Message>;
+    type Message = cosmic::Action<Message>;
 
     fn message(&self) -> Self::Message {
-        cosmic::app::Message::App(Message::NavMenuAction(*self))
+        cosmic::Action::App(Message::NavMenuAction(*self))
     }
 }
 
@@ -131,7 +131,7 @@ impl cosmic::Application for App {
     fn nav_context_menu(
         &self,
         id: nav_bar::Id,
-    ) -> Option<Vec<menu::Tree<cosmic::app::Message<Self::Message>>>> {
+    ) -> Option<Vec<menu::Tree<cosmic::Action<Self::Message>>>> {
         Some(menu::items(
             &HashMap::new(),
             vec![

examples/open-dialog/src/main.rs

@@ -7,7 +7,6 @@ use apply::Apply;
 use cosmic::app::{Core, Settings, Task};
 use cosmic::dialog::file_chooser::{self, FileFilter};
 use cosmic::iced_core::Length;
-use cosmic::surface_message::{MessageWrapper, SurfaceMessage};
 use cosmic::widget::button;
 use cosmic::{executor, iced, ApplicationExt, Element};
 use std::sync::Arc;
@@ -35,22 +34,7 @@ pub enum Message {
     OpenError(Arc<file_chooser::Error>),
     OpenFile,
     Selected(Url),
-    Surface(SurfaceMessage),
-}
-
-impl From<Message> for MessageWrapper<Message> {
-    fn from(value: Message) -> Self {
-        match value {
-            Message::Surface(s) => MessageWrapper::Surface(s),
-            m => MessageWrapper::Message(m),
-        }
-    }
-}
-
-impl From<SurfaceMessage> for Message {
-    fn from(value: SurfaceMessage) -> Self {
-        Message::Surface(value)
-    }
+    Surface(cosmic::surface::Action),
 }
 
 /// The [`App`] stores application-specific state.
@@ -202,7 +186,7 @@ impl cosmic::Application for App {
             Message::CloseError => {
                 self.error_status = None;
             }
-            Message::Surface(surface_message) => {}
+            Message::Surface(surface) => {}
         }
 
         Task::none()