1 files changed, 23 insertions, 10 deletions
diff --git a/wgpu/src/renderer/widget/image.rs b/wgpu/src/renderer/widget/image.rs
index ea9d19c7..0afb11e3 100644
--- a/wgpu/src/renderer/widget/image.rs
+++ b/wgpu/src/renderer/widget/image.rs
@@ -1,18 +1,31 @@
 use crate::{Primitive, Renderer};
-use iced_native::{image, layout, Image, Layout, MouseCursor, Rectangle};
+use iced_native::{image, layout, Image, Layout, Length, MouseCursor, Size};
 
 impl image::Renderer for Renderer {
-    fn layout(&self, image: &Image, limits: &layout::Limits) -> Layout {
-        // TODO
-        Layout::new(Rectangle {
-            x: 0.0,
-            y: 0.0,
-            width: 0.0,
-            height: 0.0,
-        })
+    fn layout(&self, image: &Image, limits: &layout::Limits) -> layout::Node {
+        let (width, height) = self.image_pipeline.dimensions(&image.path);
+
+        let aspect_ratio = width as f32 / height as f32;
+
+        // TODO: Deal with additional cases
+        let (width, height) = match (image.width, image.height) {
+            (Length::Units(width), _) => (
+                image.width,
+                Length::Units((width as f32 / aspect_ratio).round() as u16),
+            ),
+            (_, _) => {
+                (Length::Units(width as u16), Length::Units(height as u16))
+            }
+        };
+
+        let mut size = limits.width(width).height(height).resolve(Size::ZERO);
+
+        size.height = size.width / aspect_ratio;
+
+        layout::Node::new(size)
     }
 
-    fn draw(&mut self, image: &Image, layout: &Layout) -> Self::Output {
+    fn draw(&mut self, image: &Image, layout: Layout<'_>) -> Self::Output {
         (
             Primitive::Image {
                 path: image.path.clone(),