leyoda/iced-yoda
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Reduce nesting in Rectangle::offset

Browse source
This commit is contained in:
Héctor Ramón Jiménez 2025-04-26 04:50:59 +02:00
parent 00e4de88bf
commit 61b96caf21
No known key found for this signature in database
GPG key ID: 7CC46565708259A7
2 changed files with 19 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

36
core/src/rectangle.rs
View file

@ -160,25 +160,25 @@ impl Rectangle<f32> {
/// Computes the offset that must be applied to the [`Rectangle`] to be placed
/// inside the given `container`.
pub fn offset(&self, container: &Rectangle) -> Vector {
if let Some(intersection) = self.intersection(container) {
let left = intersection.x - self.x;
let top = intersection.y - self.y;
let Some(intersection) = self.intersection(container) else {
return Vector::ZERO;
};
Vector::new(
if left > 0.0 {
left
} else {
intersection.x + intersection.width - self.x - self.width
},
if top > 0.0 {
top
} else {
intersection.y + intersection.height - self.y - self.height
},
)
} else {
Vector::ZERO
}
let left = intersection.x - self.x;
let top = intersection.y - self.y;
Vector::new(
if left > 0.0 {
left
} else {
intersection.x + intersection.width - self.x - self.width
},
if top > 0.0 {
top
} else {
intersection.y + intersection.height - self.y - self.height
},
)
}
/// Returns true if the current [`Rectangle`] is completely within the given

3
examples/gallery/src/main.rs
View file

@ -211,8 +211,7 @@ fn card<'a>(
.opacity(thumbnail.fade_in.interpolate(0.0, 1.0, now))
.scale(thumbnail.zoom.interpolate(1.0, 1.1, now))
.translate(move |bounds, viewport| {
let final_bounds = bounds.zoom(1.1);
final_bounds.offset(&viewport.shrink(10))
bounds.zoom(1.1).offset(&viewport.shrink(10))
* thumbnail.zoom.interpolate(0.0, 1.0, now)
})
.style(move |_theme| image::Style {