More idiomatic layout for image widgit

Author: fishrockz

druid/src/widget/image.rs

@@ -193,16 +193,11 @@ impl<T: Data> Widget<T> for Image {
         // in the size exactly. If it is unconstrained by both width and height take the size of
         // the image.
         let max = bc.max();
+        let min = bc.min();
         let image_size = self.image_data.size();
-        let size = if bc.is_width_bounded() && !bc.is_height_bounded() {
-            let ratio = max.width / image_size.width;
-            Size::new(max.width, ratio * image_size.height)
-        } else if bc.is_height_bounded() && !bc.is_width_bounded() {
-            let ratio = max.height / image_size.height;
-            Size::new(ratio * image_size.width, max.height)
-        } else {
-            bc.constrain(self.image_data.size())
-        };
+        let width = image_size.width.max(min.width).min(max.width);
+        let height = image_size.height.max(min.height).min(max.height);
+        let size = Size::new(width, height);
         trace!("Computed size: {}", size);
         size
     }