summaryrefslogtreecommitdiffstats
path: root/wgpu/src/renderer/widget/image.rs
diff options
context:
space:
mode:
Diffstat (limited to 'wgpu/src/renderer/widget/image.rs')
-rw-r--r--wgpu/src/renderer/widget/image.rs23
1 files changed, 13 insertions, 10 deletions
diff --git a/wgpu/src/renderer/widget/image.rs b/wgpu/src/renderer/widget/image.rs
index 0e312706..0afb11e3 100644
--- a/wgpu/src/renderer/widget/image.rs
+++ b/wgpu/src/renderer/widget/image.rs
@@ -1,25 +1,28 @@
use crate::{Primitive, Renderer};
-use iced_native::{image, Image, Layout, Length, MouseCursor, Node, Style};
+use iced_native::{image, layout, Image, Layout, Length, MouseCursor, Size};
impl image::Renderer for Renderer {
- fn node(&self, image: &Image) -> Node {
+ 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;
- 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(
+ let (width, height) = match (image.width, image.height) {
+ (Length::Units(width), _) => (
+ image.width,
Length::Units((width as f32 / aspect_ratio).round() as u16),
),
- (_, _) => style
- .width(Length::Units(width as u16))
- .height(Length::Units(height as u16)),
+ (_, _) => {
+ (Length::Units(width as u16), Length::Units(height as u16))
+ }
};
- Node::new(style)
+ 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 {