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

fix: Rectangle::is_within inconsistency

Browse source
This commit is contained in:
DKolter 2025-05-29 13:26:38 +02:00
parent cd60385b1e
commit d4a692d147
1 changed files with 7 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

13
core/src/rectangle.rs
View file

@ -137,6 +137,7 @@ impl Rectangle<f32> {
} }
/// Returns true if the given [`Point`] is contained in the [`Rectangle`]. /// Returns true if the given [`Point`] is contained in the [`Rectangle`].
/// Excludes the right and bottom edges.
pub fn contains(&self, point: Point) -> bool { pub fn contains(&self, point: Point) -> bool {
self.x <= point.x self.x <= point.x
&& point.x < self.x + self.width && point.x < self.x + self.width
@ -182,13 +183,13 @@ impl Rectangle<f32> {
) )
} }
/// Returns true if the current [`Rectangle`] is completely within the given /// Returns true if the current [`Rectangle`] is within the given
/// `container`. /// `container`. Includes the right and bottom edges.
pub fn is_within(&self, container: &Rectangle) -> bool { pub fn is_within(&self, container: &Rectangle) -> bool {
container.contains(self.position()) self.x >= container.x
&& container.contains( && self.y >= container.y
self.position() + Vector::new(self.width, self.height), && self.x + self.width <= container.x + container.width
) && self.y + self.height <= container.y + container.height
} }
/// Computes the intersection with the given [`Rectangle`]. /// Computes the intersection with the given [`Rectangle`].