update iced

Cargo.toml

@@ -13,7 +13,12 @@ cosmic-greeter-daemon = { path = "daemon" }
 dirs = "5"
 env_logger.workspace = true
 freedesktop_entry_parser = "1.3.0"
-libcosmic = { workspace = true, features = ["tokio", "wayland"] }
+libcosmic = { workspace = true, features = [
+    "tokio",
+    "wayland",
+    "multi-window",
+    "winit",
+] }
 log.workspace = true
 pam-client = "0.5.0"
 pwd.workspace = true

src/greeter/ipc.rs

@@ -2,7 +2,7 @@
 // SPDX-License-Identifier: GPL-3.0-only
 
 use super::{Message, SocketState};
-use cosmic::iced::Subscription;
+use cosmic::iced::{stream, Subscription};
 use futures_util::SinkExt;
 use greetd_ipc::codec::TokioCodec;
 use std::sync::Arc;
@@ -11,10 +11,9 @@ use tokio::sync::mpsc;
 
 pub fn subscription() -> Subscription<Message> {
     struct GreetdSubscription;
-    cosmic::iced::subscription::channel(
+    Subscription::run_with_id(
         std::any::TypeId::of::<GreetdSubscription>(),
-        1,
-        |mut sender| async move {
+        stream::channel(1, |mut sender| async move {
             let (tx, mut rx) = mpsc::channel::<greetd_ipc::Request>(1);
             _ = sender.send(Message::GreetdChannel(tx)).await;
 
@@ -123,6 +122,6 @@ pub fn subscription() -> Subscription<Message> {
             }
 
             futures_util::future::pending().await
-        },
+        }),
     )
 }

src/image_container.rs

@@ -2,22 +2,21 @@ use cosmic::iced::widget::{
     image::{draw, FilterMethod, Handle},
     Container,
 };
-use cosmic::iced::ContentFit;
+use cosmic::iced::{ContentFit, Radians, Vector};
 use cosmic::iced_core::event::{self, Event};
 use cosmic::iced_core::layout;
 use cosmic::iced_core::mouse;
 use cosmic::iced_core::overlay;
 use cosmic::iced_core::renderer;
 use cosmic::iced_core::widget::{Operation, Tree};
 use cosmic::iced_core::{Clipboard, Element, Layout, Length, Rectangle, Shell, Size, Widget};
-use cosmic::iced_renderer::core::widget::OperationOutputWrapper;
 
-pub use cosmic::iced_style::container::StyleSheet;
+pub use cosmic::widget::container::Catalog;
 
 pub struct ImageContainer<'a, Message, Theme, Renderer>
 where
     Renderer: cosmic::iced_core::Renderer + cosmic::iced_core::image::Renderer<Handle = Handle>,
-    Theme: StyleSheet,
+    Theme: Catalog,
 {
     container: Container<'a, Message, Theme, Renderer>,
     image_opt: Option<Handle>,
@@ -27,7 +26,7 @@ where
 impl<'a, Message, Renderer> ImageContainer<'a, Message, cosmic::Theme, Renderer>
 where
     Renderer: cosmic::iced_core::Renderer + cosmic::iced_core::image::Renderer<Handle = Handle>,
-    cosmic::Theme: StyleSheet,
+    cosmic::Theme: Catalog,
 {
     pub fn new(container: Container<'a, Message, cosmic::Theme, Renderer>) -> Self {
         Self {
@@ -79,7 +78,7 @@ where
         tree: &mut Tree,
         layout: Layout<'_>,
         renderer: &Renderer,
-        operation: &mut dyn Operation<OperationOutputWrapper<Message>>,
+        operation: &mut dyn Operation<()>,
     ) {
         self.container.operate(tree, layout, renderer, operation)
     }
@@ -122,16 +121,17 @@ where
         cursor: mouse::Cursor,
         viewport: &Rectangle,
     ) {
-        match &self.image_opt {
-            Some(image) => draw(
+        if let Some(image) = &self.image_opt {
+            draw(
                 renderer,
                 layout,
                 image,
                 self.content_fit,
                 FilterMethod::Linear,
+                Radians(0.0).into(),
+                1.0,
                 [0.0, 0.0, 0.0, 0.0],
-            ),
-            None => {}
+            );
         }
 
         self.container.draw(
@@ -150,8 +150,9 @@ where
         tree: &'b mut Tree,
         layout: Layout<'_>,
         renderer: &Renderer,
+        translation: Vector,
     ) -> Option<overlay::Element<'b, Message, cosmic::Theme, Renderer>> {
-        self.container.overlay(tree, layout, renderer)
+        self.container.overlay(tree, layout, renderer, translation)
     }
 }