me/iced
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'master' into viewer_content_fit

Browse source
This commit is contained in:
Gigas002 2024-03-27 19:47:48 +09:00 • committed by GitHub
commit 19afc66cad
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
87 changed files with 3334 additions and 2607 deletions
Download patch file Download diff file Expand all files Collapse all files

7
widget/src/image/viewer.rs
View file

@ -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);