summaryrefslogtreecommitdiff
path: root/xfa/fde/cfde_txtedtpage.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'xfa/fde/cfde_txtedtpage.cpp')
-rw-r--r--xfa/fde/cfde_txtedtpage.cpp14
1 files changed, 6 insertions, 8 deletions
diff --git a/xfa/fde/cfde_txtedtpage.cpp b/xfa/fde/cfde_txtedtpage.cpp
index cfb7f83b2c..56e1a04a55 100644
--- a/xfa/fde/cfde_txtedtpage.cpp
+++ b/xfa/fde/cfde_txtedtpage.cpp
@@ -478,17 +478,15 @@ int32_t CFDE_TxtEdtPage::GetWidth(const FDE_TEXTEDITPIECE* pIdentity,
void CFDE_TxtEdtPage::NormalizePt2Rect(CFX_PointF& ptF,
const CFX_RectF& rtF,
FX_FLOAT fTolerance) const {
- if (rtF.Contains(ptF.x, ptF.y)) {
+ if (rtF.Contains(ptF))
return;
- }
- if (ptF.x < rtF.left) {
+ if (ptF.x < rtF.left)
ptF.x = rtF.left;
- } else if (ptF.x >= rtF.right()) {
+ else if (ptF.x >= rtF.right())
ptF.x = rtF.right() - fTolerance;
- }
- if (ptF.y < rtF.top) {
+
+ if (ptF.y < rtF.top)
ptF.y = rtF.top;
- } else if (ptF.y >= rtF.bottom()) {
+ else if (ptF.y >= rtF.bottom())
ptF.y = rtF.bottom() - fTolerance;
- }
}