feat: sound page dropdown popups

Author: wash2

Cargo.lock

@@ -19,14 +19,10 @@ use crate::pages::{self, display, system, time};
 use crate::subscription::desktop_files;
 use crate::widget::{page_title, search_header};
 use crate::PageCommands;
-use cosmic::app::command::set_theme;
 use cosmic::app::context_drawer::ContextDrawer;
-#[cfg(feature = "single-instance")]
-use cosmic::app::DbusActivationMessage;
 #[cfg(feature = "wayland")]
 use cosmic::cctk::{sctk::output::OutputInfo, wayland_client::protocol::wl_output::WlOutput};
 use cosmic::iced::Subscription;
-use cosmic::surface_message::SurfaceMessage;
 use cosmic::widget::{self, button, row, text_input};
 use cosmic::{
     app::{Core, Task},
@@ -36,6 +32,7 @@ use cosmic::{
         window, Length,
     },
     prelude::*,
+    surface,
     widget::{
         column, container, icon, id_container, nav_bar, scrollable, segmented_button, settings,
     },
@@ -140,23 +137,6 @@ impl SettingsApp {
     }
 }
 
-#[cfg(feature = "wayland")]
-impl From<Message> for cosmic::surface_message::MessageWrapper<Message> {
-    fn from(value: Message) -> Self {
-        match value {
-            Message::Surface(msg) => cosmic::surface_message::MessageWrapper::Surface(msg),
-            msg => cosmic::surface_message::MessageWrapper::Message(msg),
-        }
-    }
-}
-
-#[cfg(feature = "wayland")]
-impl From<SurfaceMessage> for Message {
-    fn from(value: SurfaceMessage) -> Self {
-        Message::Surface(value)
-    }
-}
-
 #[derive(Clone, Debug)]
 pub enum Message {
     CloseContextDrawer,
@@ -179,7 +159,7 @@ pub enum Message {
     SearchSubmit,
     SetTheme(cosmic::theme::Theme),
     SetWindowTitle,
-    Surface(SurfaceMessage),
+    Surface(surface::Action),
 }
 
 impl cosmic::Application for SettingsApp {
@@ -737,7 +717,7 @@ impl cosmic::Application for SettingsApp {
                 }
             }
 
-            Message::SetTheme(t) => return set_theme(t),
+            Message::SetTheme(t) => return cosmic::command::set_theme(t),
 
             Message::OpenContextDrawer(page, title) => {
                 self.core.window.show_context = true;
@@ -753,18 +733,22 @@ impl cosmic::Application for SettingsApp {
             Message::Error(error) => {
                 tracing::error!(error, "error occurred");
             }
-            Message::Surface(_) => {}
+            Message::Surface(a) => {
+                return cosmic::task::message(cosmic::Action::Cosmic(
+                    cosmic::app::Action::Surface(a),
+                ));
+            }
         }
 
         Task::none()
     }
 
     #[cfg(feature = "single-instance")]
-    fn dbus_activation(&mut self, msg: DbusActivationMessage) -> Task<Self::Message> {
+    fn dbus_activation(&mut self, msg: cosmic::dbus_activation::Message) -> Task<Self::Message> {
         match msg.msg {
-            cosmic::app::DbusActivationDetails::Activate
-            | cosmic::app::DbusActivationDetails::Open { .. } => None,
-            cosmic::app::DbusActivationDetails::ActivateAction { action, .. } => {
+            cosmic::dbus_activation::Details::Activate
+            | cosmic::dbus_activation::Details::Open { .. } => None,
+            cosmic::dbus_activation::Details::ActivateAction { action, .. } => {
                 PageCommands::from_str(&action)
                     .ok()
                     .and_then(|action| self.subtask_to_page(&action))