summaryrefslogtreecommitdiff
path: root/core/fxcrt/fx_basic_coords.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'core/fxcrt/fx_basic_coords.cpp')
-rw-r--r--core/fxcrt/fx_basic_coords.cpp11
1 files changed, 4 insertions, 7 deletions
diff --git a/core/fxcrt/fx_basic_coords.cpp b/core/fxcrt/fx_basic_coords.cpp
index c9f3195f36..3e306339f2 100644
--- a/core/fxcrt/fx_basic_coords.cpp
+++ b/core/fxcrt/fx_basic_coords.cpp
@@ -190,7 +190,10 @@ FX_RECT CFX_FloatRect::GetClosestRect() const {
}
bool CFX_FloatRect::Contains(const CFX_PointF& point) const {
- return Contains(point.x, point.y);
+ CFX_FloatRect n1(*this);
+ n1.Normalize();
+ return point.x <= n1.right && point.x >= n1.left && point.y <= n1.top &&
+ point.y >= n1.bottom;
}
bool CFX_FloatRect::Contains(const CFX_FloatRect& other_rect) const {
@@ -202,12 +205,6 @@ bool CFX_FloatRect::Contains(const CFX_FloatRect& other_rect) const {
n2.top <= n1.top;
}
-bool CFX_FloatRect::Contains(FX_FLOAT x, FX_FLOAT y) const {
- CFX_FloatRect n1(*this);
- n1.Normalize();
- return x <= n1.right && x >= n1.left && y <= n1.top && y >= n1.bottom;
-}
-
void CFX_FloatRect::UpdateRect(FX_FLOAT x, FX_FLOAT y) {
left = std::min(left, x);
right = std::max(right, x);