Update iced/libcosmic

src/backend/mock.rs

@@ -16,7 +16,7 @@ use cosmic::{
         self,
         futures::{executor::block_on, FutureExt, SinkExt},
     },
-    iced_sctk::subsurface_widget::{Shmbuf, SubsurfaceBuffer},
+    iced_winit::platform_specific::wayland::subsurface_widget::{Shmbuf, SubsurfaceBuffer},
 };
 
 use futures_channel::mpsc;
@@ -61,11 +61,7 @@ fn create_solid_capture_image(r: u8, g: u8, b: u8) -> CaptureImage {
         ))
         .0,
         #[cfg(feature = "no-subsurfaces")]
-        image: cosmic::widget::image::Handle::from_pixels(
-            512,
-            512,
-            [r, g, b, 255].repeat(512 * 512),
-        ),
+        image: cosmic::widget::image::Handle::from_rgba(512, 512, [r, g, b, 255].repeat(512 * 512)),
     }
 }
 
@@ -108,7 +104,7 @@ pub struct Workspace {
 }
 
 pub fn subscription(conn: Connection) -> iced::Subscription<Event> {
-    iced::subscription::run_with_id("wayland-mock-sub", async { start(conn) }.flatten_stream())
+    iced::Subscription::run_with_id("wayland-mock-sub", async { start(conn) }.flatten_stream())
 }
 
 struct AppData {

src/backend/mod.rs

@@ -8,7 +8,8 @@
 //! backend for testing without any special protocols.
 
 use cosmic::{
-    cctk::wayland_client::protocol::wl_output, iced_sctk::subsurface_widget::SubsurfaceBuffer,
+    cctk::wayland_client::protocol::wl_output,
+    iced_winit::platform_specific::wayland::subsurface_widget::SubsurfaceBuffer,
 };
 use std::collections::HashSet;
 

src/backend/wayland/buffer.rs

@@ -7,7 +7,9 @@ use cctk::{
 };
 use cosmic::{
     cctk,
-    iced_sctk::subsurface_widget::{BufferSource, Dmabuf, Plane, Shmbuf},
+    iced_winit::platform_specific::wayland::subsurface_widget::{
+        BufferSource, Dmabuf, Plane, Shmbuf,
+    },
 };
 use std::{
     os::fd::AsFd,

src/backend/wayland/capture.rs

@@ -13,7 +13,7 @@ use std::sync::{Arc, Mutex};
 
 use super::{AppData, ScreencopySession, SessionData};
 
-#[derive(Clone, Hash, PartialEq, Eq)]
+#[derive(Clone, Debug, Hash, PartialEq, Eq)]
 pub enum CaptureSource {
     Toplevel(zcosmic_toplevel_handle_v1::ZcosmicToplevelHandleV1),
     Workspace(

src/backend/wayland/mod.rs

@@ -41,7 +41,7 @@ mod workspace;
 use super::{CaptureFilter, CaptureImage, Cmd, Event};
 
 pub fn subscription(conn: Connection) -> iced::Subscription<Event> {
-    iced::subscription::run_with_id("wayland-sub", async { start(conn) }.flatten_stream())
+    iced::Subscription::run_with_id("wayland-sub", async { start(conn) }.flatten_stream())
 }
 
 pub struct AppData {

src/backend/wayland/screencopy.rs

@@ -11,7 +11,9 @@ use cosmic::{
         },
         wayland_client::{Connection, Proxy, QueueHandle, WEnum},
     },
-    iced_sctk::subsurface_widget::{SubsurfaceBuffer, SubsurfaceBufferRelease},
+    iced_winit::platform_specific::wayland::subsurface_widget::{
+        SubsurfaceBuffer, SubsurfaceBufferRelease,
+    },
 };
 use std::{
     array,
@@ -206,7 +208,7 @@ impl ScreencopyHandler for AppData {
             width: front.size.0,
             height: front.size.1,
             #[cfg(feature = "no-subsurfaces")]
-            image: cosmic::widget::image::Handle::from_pixels(
+            image: cosmic::widget::image::Handle::from_rgba(
                 front.size.0,
                 front.size.1,
                 front.mmap.to_vec(),