wip: update to use cosmic-advanced-text

src/widget/icon.rs

@@ -90,7 +90,13 @@ impl<'a> IconSource<'a> {
     }
 
     /// Get a handle to a raster image from memory.
-    pub fn raster_from_memory(bytes: impl Into<Cow<'static, [u8]>>) -> Self {
+    pub fn raster_from_memory(
+        bytes: impl Into<Cow<'static, [u8]>>
+            + std::convert::AsRef<[u8]>
+            + std::marker::Send
+            + std::marker::Sync
+            + 'static,
+    ) -> Self {
         IconSource::Handle(Handle::Image(image::Handle::from_memory(bytes)))
     }
 
@@ -98,7 +104,11 @@ impl<'a> IconSource<'a> {
     pub fn raster_from_pixels(
         width: u32,
         height: u32,
-        pixels: impl Into<Cow<'static, [u8]>>,
+        pixels: impl Into<Cow<'static, [u8]>>
+            + std::convert::AsRef<[u8]>
+            + std::marker::Send
+            + std::marker::Sync
+            + 'static,
     ) -> Self {
         IconSource::Handle(Handle::Image(image::Handle::from_pixels(
             width, height, pixels,
@@ -165,7 +175,7 @@ impl From<svg::Handle> for IconSource<'static> {
 }
 
 /// A lazily-generated icon.
-#[derive(Hash, Setters)]
+#[derive(Setters)]
 pub struct Icon<'a> {
     #[setters(skip)]
     source: IconSource<'a>,
@@ -181,6 +191,18 @@ pub struct Icon<'a> {
     force_svg: bool,
 }
 
+// TODO what to do here
+impl Hash for Icon<'_> {
+    fn hash<H: Hasher>(&self, state: &mut H) {
+        self.source.hash(state);
+        self.theme.hash(state);
+        self.style.hash(state);
+        self.size.hash(state);
+        self.content_fit.hash(state);
+        self.force_svg.hash(state);
+    }
+}
+
 /// A lazily-generated icon.
 #[must_use]
 pub fn icon<'a>(source: impl Into<IconSource<'a>>, size: u16) -> Icon<'a> {
@@ -199,8 +221,8 @@ pub fn icon<'a>(source: impl Into<IconSource<'a>>, size: u16) -> Icon<'a> {
 impl<'a> Icon<'a> {
     fn raster_element<Message: 'static>(&self, handle: image::Handle) -> Element<'static, Message> {
         Image::new(handle)
-            .width(self.width.unwrap_or(Length::Units(self.size)))
-            .height(self.height.unwrap_or(Length::Units(self.size)))
+            .width(self.width.unwrap_or(Length::Fixed(self.size as f32)))
+            .height(self.height.unwrap_or(Length::Fixed(self.size as f32)))
             .content_fit(self.content_fit)
             .into()
     }
@@ -208,8 +230,8 @@ impl<'a> Icon<'a> {
     fn svg_element<Message: 'static>(&self, handle: svg::Handle) -> Element<'static, Message> {
         svg::Svg::<Renderer>::new(handle)
             .style(self.style.clone())
-            .width(self.width.unwrap_or(Length::Units(self.size)))
-            .height(self.height.unwrap_or(Length::Units(self.size)))
+            .width(self.width.unwrap_or(Length::Fixed(self.size as f32)))
+            .height(self.height.unwrap_or(Length::Fixed(self.size as f32)))
             .content_fit(self.content_fit)
             .into()
     }
@@ -228,7 +250,7 @@ impl<'a> Icon<'a> {
         let mut source = IconSource::Name(Cow::Borrowed(""));
         std::mem::swap(&mut source, &mut self.source);
 
-        iced_lazy::lazy(hash, move || -> Element<Message> {
+        iced::widget::lazy(hash, move |_| -> Element<Message> {
             match source.load(self.size, self.theme.as_deref(), self.force_svg) {
                 Handle::Svg(handle) => self.svg_element(handle),
                 Handle::Image(handle) => self.raster_element(handle),