Add an offset to IconSurface, so icon can be offset from custor

core/src/clipboard.rs

@@ -5,25 +5,27 @@ use std::any::Any;
 use dnd::{DndAction, DndDestinationRectangle, DndSurface};
 use mime::{self, AllowedMimeTypes, AsMimeTypes, ClipboardStoreData};
 
-use crate::{widget::tree::State, window, Element};
+use crate::{widget::tree::State, window, Element, Vector};
 
 #[derive(Debug)]
 pub struct IconSurface<E> {
     pub element: E,
     pub state: State,
+    pub offset: Vector,
 }
 
 pub type DynIconSurface = IconSurface<Box<dyn Any>>;
 
 impl<T: 'static, R: 'static> IconSurface<Element<'static, (), T, R>> {
-    pub fn new(element: Element<'static, (), T, R>, state: State) -> Self {
-        Self { element, state }
+    pub fn new(element: Element<'static, (), T, R>, state: State, offset: Vector) -> Self {
+        Self { element, state, offset }
     }
 
     fn upcast(self) -> DynIconSurface {
         IconSurface {
             element: Box::new(self.element),
             state: self.state,
+            offset: self.offset,
         }
     }
 }
@@ -36,6 +38,7 @@ impl DynIconSurface {
         IconSurface {
             element: *self.element.downcast().expect("drag-and-drop icon surface has invalid element type"),
             state: self.state,
+            offset: self.offset,
         }
     }
 }

winit/src/platform_specific/mod.rs

@@ -4,7 +4,7 @@
 use std::collections::HashMap;
 
 use iced_graphics::Compositor;
-use iced_runtime::{core::window, user_interface, Debug};
+use iced_runtime::{core::{window, Vector}, user_interface, Debug};
 use raw_window_handle::HasWindowHandle;
 
 #[cfg(all(feature = "wayland", target_os = "linux"))]
@@ -128,10 +128,10 @@ impl PlatformSpecific {
         None
     }
 
-    pub(crate) fn update_surface_shm(&mut self, surface: &dyn HasWindowHandle, width: u32, height: u32, data: &[u8]) {
+    pub(crate) fn update_surface_shm(&mut self, surface: &dyn HasWindowHandle, width: u32, height: u32, data: &[u8], offset: Vector) {
         #[cfg(all(feature = "wayland", target_os = "linux"))]
         {
-            return self.wayland.update_surface_shm(surface, width, height, data);
+            return self.wayland.update_surface_shm(surface, width, height, data, offset);
         }
     }
 }

winit/src/platform_specific/wayland/mod.rs

@@ -15,7 +15,7 @@ use cctk::sctk::reexports::client::protocol::wl_surface::WlSurface;
 use cctk::sctk::seat::keyboard::Modifiers;
 use iced_futures::futures::channel::mpsc;
 use iced_graphics::Compositor;
-use iced_runtime::core::window;
+use iced_runtime::core::{window, Vector};
 use iced_runtime::Debug;
 use raw_window_handle::{DisplayHandle, HasDisplayHandle, HasWindowHandle};
 use raw_window_handle::{HasRawDisplayHandle, RawWindowHandle};
@@ -239,12 +239,12 @@ impl WaylandSpecific {
         }
     }
 
-    pub(crate) fn update_surface_shm(&mut self, window: &dyn HasWindowHandle, width: u32, height: u32, data: &[u8]) {
+    pub(crate) fn update_surface_shm(&mut self, window: &dyn HasWindowHandle, width: u32, height: u32, data: &[u8], offset: Vector) {
         if let Some(subsurface_state) = self.subsurface_state.as_mut() {
             if let RawWindowHandle::Wayland(window) = window.window_handle().unwrap().as_raw() {
                 let id = unsafe { ObjectId::from_ptr(WlSurface::interface(), window.surface.as_ptr().cast()).unwrap() };
                 let surface = WlSurface::from_id(self.conn.as_ref().unwrap(), id).unwrap();
-                subsurface_state.update_surface_shm(&surface, width, height, data);
+                subsurface_state.update_surface_shm(&surface, width, height, data, offset);
             }
         }
     }

winit/src/platform_specific/wayland/subsurface_widget.rs

@@ -4,7 +4,7 @@ use crate::core::{
     layout::{self, Layout},
     mouse, renderer,
     widget::{self, Widget},
-    ContentFit, Element, Length, Rectangle, Size,
+    ContentFit, Element, Length, Rectangle, Size, Vector,
 };
 use std::{
     cell::RefCell,
@@ -377,13 +377,14 @@ impl SubsurfaceState {
             .create_surface(&self.qh, SurfaceData::new(None, 1))
     }
 
-    pub fn update_surface_shm(&self, surface: &WlSurface, width: u32, height: u32, data: &[u8]) {
+    pub fn update_surface_shm(&self, surface: &WlSurface, width: u32, height: u32, data: &[u8], offset: Vector) {
         let shm = ShmGlobal(&self.wl_shm);
         let mut pool = SlotPool::new(width as usize * height as usize * 4, &shm).unwrap();
         let (buffer, canvas) = pool.create_buffer(width as i32, height as i32, width as i32 * 4, wl_shm::Format::Argb8888).unwrap();
         canvas[0..width as usize * height as usize * 4].copy_from_slice(data);
         surface.damage_buffer(0, 0, width as i32, height as i32);
         buffer.attach_to(&surface);
+        surface.offset(offset.x as i32, offset.y as i32);
         surface.commit();
     }
 

winit/src/program.rs

@@ -956,7 +956,7 @@ async fn run_instance<'a, P, C>(
                                 let id = window::Id::unique();
                                 platform_specific_handler
                                     .update_subsurfaces(id, &surface);
-                                platform_specific_handler.update_surface_shm(&surface, viewport.physical_width(), viewport.physical_height(), &bytes);
+                                platform_specific_handler.update_surface_shm(&surface, viewport.physical_width(), viewport.physical_height(), &bytes, icon_surface.offset);
                                 let surface = Arc::new(surface);
                                 dnd_surface = Some(surface.clone());
                                 Icon::Surface(dnd::DndSurface(surface))