Add CaptureImage type

src/wayland/mod.rs

@@ -33,7 +33,6 @@ use cctk::{
 use cosmic::iced::{
     self,
     futures::{executor::block_on, FutureExt, SinkExt},
-    widget::image,
 };
 use futures_channel::mpsc;
 use std::{
@@ -67,7 +66,7 @@ pub enum Event {
     WorkspaceCapture(
         zcosmic_workspace_handle_v1::ZcosmicWorkspaceHandleV1,
         wl_output::WlOutput,
-        image::Handle,
+        CaptureImage,
     ),
     NewToplevel(
         zcosmic_toplevel_handle_v1::ZcosmicToplevelHandleV1,
@@ -80,11 +79,16 @@ pub enum Event {
     CloseToplevel(zcosmic_toplevel_handle_v1::ZcosmicToplevelHandleV1),
     ToplevelCapture(
         zcosmic_toplevel_handle_v1::ZcosmicToplevelHandleV1,
-        image::Handle,
+        CaptureImage,
     ),
     Seats(Vec<wl_seat::WlSeat>),
 }
 
+#[derive(Clone, Debug)]
+pub struct CaptureImage {
+    pub img: iced::widget::image::Handle,
+}
+
 pub fn subscription(conn: Connection) -> iced::Subscription<Event> {
     iced::subscription::run_with_id("wayland-sub", async { start(conn) }.flatten_stream())
 }

src/wayland/screencopy.rs

@@ -4,7 +4,7 @@ use cctk::{
     wayland_client::{Connection, QueueHandle, WEnum},
 };
 
-use super::{AppData, Capture, CaptureSource, Event};
+use super::{AppData, Capture, CaptureImage, CaptureSource, Event};
 
 impl ScreencopyHandler for AppData {
     fn screencopy_state(&mut self) -> &mut ScreencopyState {
@@ -59,7 +59,8 @@ impl ScreencopyHandler for AppData {
         }
 
         let mut buffer = capture.buffer.lock().unwrap();
-        let image = unsafe { buffer.as_mut().unwrap().to_image() };
+        let img = unsafe { buffer.as_mut().unwrap().to_image() };
+        let image = CaptureImage { img };
         match &capture.source {
             CaptureSource::Toplevel(toplevel) => {
                 self.send_event(Event::ToplevelCapture(toplevel.clone(), image))