Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-06 06:00:15 +01:00
Code Issues Projects Releases Packages Wiki Activity

Auto merge of #8797 - cheba:rect-contains, r=Manishearth

Browse source 
Replaced rect_contains_point with Rect.contains()

This is a proposed in servo/servo#8791 clean up.

Fixes #8791.

<!-- Reviewable:start -->
[<img src="https://reviewable.io/review_button.png" height=40 alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/8797)
<!-- Reviewable:end -->
This commit is contained in:
bors-servo 2015-12-04 04:01:44 +05:30
commit 68922e0ac2
2 changed files with 4 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

10
components/util/geometry.rs
View file

@ -75,16 +75,6 @@ pub static MAX_RECT: Rect<Au> = Rect {
}
};
/// Returns true if the rect contains the given point. Points on the top or left sides of the rect
/// are considered inside the rectangle, while points on the right or bottom sides of the rect are
/// not considered inside the rectangle.
pub fn rect_contains_point<T>(rect: Rect<T>, point: Point2D<T>) -> bool
where T: PartialOrd + Add<T, Output=T>
{
point.x >= rect.origin.x && point.x < rect.origin.x + rect.size.width &&
point.y >= rect.origin.y && point.y < rect.origin.y + rect.size.height
}
/// A helper function to convert a rect of `f32` pixels to a rect of app units.
pub fn f32_rect_to_au_rect(rect: Rect<f32>) -> Rect<Au> {
Rect::new(Point2D::new(Au::from_f32_px(rect.origin.x), Au::from_f32_px(rect.origin.y)),