diff options
Diffstat (limited to '')
-rw-r--r-- | widget/src/image.rs | 10 | ||||
-rw-r--r-- | widget/src/image/viewer.rs | 7 |
2 files changed, 10 insertions, 7 deletions
diff --git a/widget/src/image.rs b/widget/src/image.rs index ccf1f175..f673c7b3 100644 --- a/widget/src/image.rs +++ b/widget/src/image.rs @@ -93,7 +93,7 @@ where { // The raw w/h of the underlying image let image_size = { - let Size { width, height } = renderer.dimensions(handle); + let Size { width, height } = renderer.measure_image(handle); Size::new(width as f32, height as f32) }; @@ -130,7 +130,7 @@ pub fn draw<Renderer, Handle>( Renderer: image::Renderer<Handle = Handle>, Handle: Clone + Hash, { - let Size { width, height } = renderer.dimensions(handle); + let Size { width, height } = renderer.measure_image(handle); let image_size = Size::new(width as f32, height as f32); let bounds = layout.bounds(); @@ -148,7 +148,11 @@ pub fn draw<Renderer, Handle>( ..bounds }; - renderer.draw(handle.clone(), filter_method, drawing_bounds + offset); + renderer.draw_image( + handle.clone(), + filter_method, + drawing_bounds + offset, + ); }; if adjusted_fit.width > bounds.width || adjusted_fit.height > bounds.height diff --git a/widget/src/image/viewer.rs b/widget/src/image/viewer.rs index bd10e953..fba00028 100644 --- a/widget/src/image/viewer.rs +++ b/widget/src/image/viewer.rs @@ -127,7 +127,7 @@ where limits: &layout::Limits, ) -> layout::Node { let image_size = { - let Size { width, height } = renderer.dimensions(&self.handle); + let Size { width, height } = renderer.measure_image(&self.handle); Size::new(width as f32, height as f32) }; let raw_size = limits.resolve(self.width, self.height, image_size); @@ -344,8 +344,7 @@ where height: image_size.height, ..bounds }; - - renderer.draw( + renderer.draw_image( self.handle.clone(), self.filter_method, drawing_bounds, @@ -429,7 +428,7 @@ pub fn image_size<Renderer>( where Renderer: image::Renderer, { - let size = renderer.dimensions(handle); + let size = renderer.measure_image(handle); let size = Size::new(size.width as f32, size.height as f32); let size = content_fit.fit(size, bounds); |