1 files changed, 28 insertions, 10 deletions
diff --git a/wgpu/src/renderer/image.rs b/wgpu/src/renderer/image.rs
index a29a3d49..0e312706 100644
--- a/wgpu/src/renderer/image.rs
+++ b/wgpu/src/renderer/image.rs
@@ -1,16 +1,34 @@
 use crate::{Primitive, Renderer};
-use iced_native::{image, Image, Layout, MouseCursor, Node, Style};
+use iced_native::{image, Image, Layout, Length, MouseCursor, Node, Style};
 
-impl image::Renderer<&str> for Renderer {
-    fn node(&self, _image: &Image<&str>) -> Node {
-        Node::new(Style::default())
+impl image::Renderer for Renderer {
+    fn node(&self, image: &Image) -> Node {
+        let (width, height) = self.image_pipeline.dimensions(&image.path);
+
+        let aspect_ratio = width as f32 / height as f32;
+
+        let mut style = Style::default().align_self(image.align_self);
+
+        // TODO: Deal with additional cases
+        style = match (image.width, image.height) {
+            (Length::Units(width), _) => style.width(image.width).height(
+                Length::Units((width as f32 / aspect_ratio).round() as u16),
+            ),
+            (_, _) => style
+                .width(Length::Units(width as u16))
+                .height(Length::Units(height as u16)),
+        };
+
+        Node::new(style)
     }
 
-    fn draw(
-        &mut self,
-        _image: &Image<&str>,
-        _layout: Layout<'_>,
-    ) -> Self::Output {
-        (Primitive::None, MouseCursor::OutOfBounds)
+    fn draw(&mut self, image: &Image, layout: Layout<'_>) -> Self::Output {
+        (
+            Primitive::Image {
+                path: image.path.clone(),
+                bounds: layout.bounds(),
+            },
+            MouseCursor::OutOfBounds,
+        )
     }
 }