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

Improve code style in vector modules

Browse source
This commit is contained in:
Héctor Ramón Jiménez 2023-07-12 09:07:20 +02:00
parent 9f73ee3206
commit 6502cf1111
No known key found for this signature in database
GPG key ID: 140CC052C94F138E
2 changed files with 24 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

23
tiny_skia/src/vector.rs
View file

@ -131,23 +131,24 @@ impl Cache {
let mut image = tiny_skia::Pixmap::new(size.width, size.height)?; let mut image = tiny_skia::Pixmap::new(size.width, size.height)?;
let tree_size = tree.size.to_int_size(); let tree_size = tree.size.to_int_size();
let target_size;
if size.width > size.height { let target_size = if size.width > size.height {
target_size = tree_size.scale_to_width(size.width); tree_size.scale_to_width(size.width)
} else { } else {
target_size = tree_size.scale_to_height(size.height); tree_size.scale_to_height(size.height)
} };
let transform;
if let Some(target_size) = target_size { let transform = if let Some(target_size) = target_size {
let tree_size = tree_size.to_size(); let tree_size = tree_size.to_size();
let target_size = target_size.to_size(); let target_size = target_size.to_size();
transform = tiny_skia::Transform::from_scale(
tiny_skia::Transform::from_scale(
target_size.width() / tree_size.width(), target_size.width() / tree_size.width(),
target_size.height() / tree_size.height(), target_size.height() / tree_size.height(),
); )
} else { } else {
transform = tiny_skia::Transform::default(); tiny_skia::Transform::default()
} };
resvg::Tree::from_usvg(tree).render(transform, &mut image.as_mut()); resvg::Tree::from_usvg(tree).render(transform, &mut image.as_mut());

23
wgpu/src/image/vector.rs
View file

@ -115,23 +115,24 @@ impl Cache {
let mut img = tiny_skia::Pixmap::new(width, height)?; let mut img = tiny_skia::Pixmap::new(width, height)?;
let tree_size = tree.size.to_int_size(); let tree_size = tree.size.to_int_size();
let target_size;
if width > height { let target_size = if width > height {
target_size = tree_size.scale_to_width(width); tree_size.scale_to_width(width)
} else { } else {
target_size = tree_size.scale_to_height(height); tree_size.scale_to_height(height)
} };
let transform;
if let Some(target_size) = target_size { let transform = if let Some(target_size) = target_size {
let tree_size = tree_size.to_size(); let tree_size = tree_size.to_size();
let target_size = target_size.to_size(); let target_size = target_size.to_size();
transform = tiny_skia::Transform::from_scale(
tiny_skia::Transform::from_scale(
target_size.width() / tree_size.width(), target_size.width() / tree_size.width(),
target_size.height() / tree_size.height(), target_size.height() / tree_size.height(),
); )
} else { } else {
transform = tiny_skia::Transform::default(); tiny_skia::Transform::default()
} };
resvg::Tree::from_usvg(tree) resvg::Tree::from_usvg(tree)
.render(transform, &mut img.as_mut()); .render(transform, &mut img.as_mut());