chore: update libcosmic

Author: wash2

.vscode/settings.json

@@ -1,3 +1,3 @@
 {
-    "rust-analyzer.check.overrideCommand": ["just", "check-json"]
-}
+    // "rust-analyzer.check.overrideCommand": ["just", "check-json"]
+}

Cargo.lock

@@ -56,15 +56,13 @@ cosmic-client-toolkit = { git = "https://github.com/pop-os/cosmic-protocols//",
 # cosmic-settings-config = { git = "https://github.com/pop-os/cosmic-settings-daemon//", branch = "input_nobuild" }
 
 # For development and testing purposes
-# [patch.'https://github.com/pop-os/libcosmic']
-# libcosmic = { git = "https://github.com/pop-os/libcosmic//", branch = "font" }
-# cosmic-config = { git = "https://github.com/pop-os/libcosmic//", branch = "font" }
-# cosmic-theme = { git = "https://github.com/pop-os/libcosmic//", branch = "font" }
-# iced_futures = { git = "https://github.com/pop-os/libcosmic//", branch = "font" }
-
-# libcosmic = { path = "../libcosmic" }
-# cosmic-config = { path = "../libcosmic/cosmic-config" }
-# cosmic-theme = { path = "../libcosmic/cosmic-theme" }
+[patch.'https://github.com/pop-os/libcosmic']
+# libcosmic = { git = "https://github.com/pop-os/libcosmic//", branch = "fontconfig" }
+# cosmic-config = { git = "https://github.com/pop-os/libcosmic//", branch = "fontconfig" }
+# cosmic-theme = { git = "https://github.com/pop-os/libcosmic//", branch = "fontconfig" }
+libcosmic = { path = "../libcosmic" }
+cosmic-config = { path = "../libcosmic/cosmic-config" }
+cosmic-theme = { path = "../libcosmic/cosmic-theme" }
 
 # [patch.'https://github.com/pop-os/dbus-settings-bindings']
 # cosmic-dbus-networkmanager = { path = "../dbus-settings-bindings/networkmanager" }

Cargo.toml

@@ -26,6 +26,7 @@ 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},
@@ -139,6 +140,23 @@ 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,
@@ -161,6 +179,7 @@ pub enum Message {
     SearchSubmit,
     SetTheme(cosmic::theme::Theme),
     SetWindowTitle,
+    Surface(SurfaceMessage),
 }
 
 impl cosmic::Application for SettingsApp {
@@ -240,7 +259,7 @@ impl cosmic::Application for SettingsApp {
                 .id(self.search_id.clone())
                 .on_clear(Message::SearchClear)
                 .on_input(Message::SearchChanged)
-                .on_submit(Message::SearchSubmit)
+                .on_submit(|_| Message::SearchSubmit)
                 .into()
         } else {
             icon::from_name("system-search-symbolic")
@@ -734,6 +753,7 @@ impl cosmic::Application for SettingsApp {
             Message::Error(error) => {
                 tracing::error!(error, "error occurred");
             }
+            Message::Surface(_) => {}
         }
 
         Task::none()

cosmic-settings/src/app.rs

@@ -310,7 +310,7 @@ pub fn focus_navigation() -> Section<crate::pages::Message> {
                     })
                     .select_on_focus(true)
                     .on_input(Message::SetFocusFollowsCursorDelay)
-                    .on_submit(Message::SaveFocusFollowsCursorDelay(true))
+                    .on_submit(|_| Message::SaveFocusFollowsCursorDelay(true))
                     .width(Length::Fixed(80.0)),
                 ))
                 .add(settings::item(

cosmic-settings/src/pages/desktop/window_management.rs

@@ -516,7 +516,7 @@ fn context_drawer(
             })
             .select_on_focus(true)
             .on_input(move |text| ShortcutMessage::InputBinding(bind_id, text))
-            .on_submit(ShortcutMessage::SubmitBinding(bind_id))
+            .on_submit(move |_| ShortcutMessage::SubmitBinding(bind_id))
             .padding([0, space_xs])
             .id(shortcut.id.clone())
             .into();

cosmic-settings/src/pages/input/keyboard/shortcuts/common.rs

@@ -231,13 +231,13 @@ impl Page {
         let name_input = widget::text_input("", &self.add_shortcut.name)
             .padding([6, 12])
             .on_input(Message::NameInput)
-            .on_submit(Message::NameSubmit)
+            .on_submit(|_| Message::NameSubmit)
             .id(self.name_id.clone());
 
         let task_input = widget::text_input("", &self.add_shortcut.task)
             .padding([6, 12])
             .on_input(Message::TaskInput)
-            .on_submit(Message::EditCombination)
+            .on_submit(|_| Message::EditCombination)
             .id(self.task_id.clone());
 
         let name_control = widget::column()
@@ -267,7 +267,7 @@ impl Page {
                 )
                 .padding([0, 12])
                 .on_input(move |input| Message::KeyInput(id, input))
-                .on_submit(Message::AddKeybinding)
+                .on_submit(|_| Message::AddKeybinding)
                 .id(widget_id.clone())
                 .apply(widget::container)
                 .padding([8, 24]);

cosmic-settings/src/pages/input/keyboard/shortcuts/custom.rs

@@ -250,7 +250,7 @@ impl page::Page<crate::pages::Message> for Page {
                     *password_hidden,
                 )
                 .on_input(|input| Message::PasswordUpdate(SecureString::from(input)))
-                .on_submit(Message::ConnectWithPassword);
+                .on_submit(|_| Message::ConnectWithPassword);
 
                 let controls = widget::column::with_capacity(2)
                     .spacing(12)

cosmic-settings/src/pages/networking/vpn/mod.rs

@@ -145,7 +145,7 @@ impl page::Page<crate::pages::Message> for Page {
                     *password_hidden,
                 )
                 .on_input(|input| Message::PasswordUpdate(SecureString::from(input)))
-                .on_submit(Message::ConnectWithPassword);
+                .on_submit(|_| Message::ConnectWithPassword);
 
                 let primary_action = widget::button::suggested(fl!("connect"))
                     .on_press(Message::ConnectWithPassword);

cosmic-settings/src/pages/networking/wifi.rs

@@ -137,7 +137,7 @@ fn device() -> Section<crate::pages::Message> {
             )
             .width(250)
             .on_input(Message::HostnameInput)
-            .on_submit(Message::HostnameSubmit);
+            .on_submit(|_| Message::HostnameSubmit);
 
             let device_name = settings::item::builder(&*desc[device])
                 .description(&*desc[device_desc])