summaryrefslogtreecommitdiff
path: root/xfa/fwl
diff options
context:
space:
mode:
authordsinclair <dsinclair@chromium.org>2016-04-18 12:09:58 -0700
committerCommit bot <commit-bot@chromium.org>2016-04-18 12:09:58 -0700
commit076f5ac6084e3170dabfc598541dd4e94126dc9c (patch)
tree4d90ea60efdeffe36de4ad353953b98a4bf4c720 /xfa/fwl
parent9b3656b8b49db7f228304aff9ffa599999199a0c (diff)
downloadpdfium-076f5ac6084e3170dabfc598541dd4e94126dc9c.tar.xz
Make FWL_CornerEnlarge a const
This CL changes the FWL_CornerEnlarge define into a const value in the anonymous namespace. Review URL: https://codereview.chromium.org/1896923002
Diffstat (limited to 'xfa/fwl')
-rw-r--r--xfa/fwl/core/fwl_formimp.cpp38
1 files changed, 20 insertions, 18 deletions
diff --git a/xfa/fwl/core/fwl_formimp.cpp b/xfa/fwl/core/fwl_formimp.cpp
index 4e67670ad2..5b1fe7aa28 100644
--- a/xfa/fwl/core/fwl_formimp.cpp
+++ b/xfa/fwl/core/fwl_formimp.cpp
@@ -25,7 +25,12 @@
#define FWL_SYSBTNSIZE 21
#define FWL_SYSBTNMARGIN 5
#define FWL_SYSBTNSPAN 2
-#define FWL_CornerEnlarge 10
+
+namespace {
+
+const uint8_t kCornerEnlarge = 10;
+
+} // namespace
// static
IFWL_Form* IFWL_Form::CreateFormProxy(CFWL_WidgetImpProperties& properties,
@@ -213,47 +218,44 @@ uint32_t CFWL_FormImp::HitTest(FX_FLOAT fx, FX_FLOAT fy) {
}
if ((m_pProperties->m_dwStyles & FWL_WGTSTYLE_Border) &&
(m_pProperties->m_dwStyleExes & FWL_STYLEEXT_FRM_Resize)) {
- FX_FLOAT fWidth =
- m_rtRelative.width - 2 * (m_fCYBorder + FWL_CornerEnlarge);
- FX_FLOAT fHeight =
- m_rtRelative.height - 2 * (m_fCXBorder + FWL_CornerEnlarge);
+ FX_FLOAT fWidth = m_rtRelative.width - 2 * (m_fCYBorder + kCornerEnlarge);
+ FX_FLOAT fHeight = m_rtRelative.height - 2 * (m_fCXBorder + kCornerEnlarge);
CFX_RectF rt;
- rt.Set(0, m_fCXBorder + FWL_CornerEnlarge, m_fCYBorder, fHeight);
+ rt.Set(0, m_fCXBorder + kCornerEnlarge, m_fCYBorder, fHeight);
if (rt.Contains(fx, fy)) {
return FWL_WGTHITTEST_Left;
}
- rt.Set(m_rtRelative.width - m_fCYBorder, m_fCXBorder + FWL_CornerEnlarge,
+ rt.Set(m_rtRelative.width - m_fCYBorder, m_fCXBorder + kCornerEnlarge,
m_fCYBorder, fHeight);
if (rt.Contains(fx, fy)) {
return FWL_WGTHITTEST_Right;
}
- rt.Set(m_fCYBorder + FWL_CornerEnlarge, 0, fWidth, m_fCXBorder);
+ rt.Set(m_fCYBorder + kCornerEnlarge, 0, fWidth, m_fCXBorder);
if (rt.Contains(fx, fy)) {
return FWL_WGTHITTEST_Top;
}
- rt.Set(m_fCYBorder + FWL_CornerEnlarge, m_rtRelative.height - m_fCXBorder,
+ rt.Set(m_fCYBorder + kCornerEnlarge, m_rtRelative.height - m_fCXBorder,
fWidth, m_fCXBorder);
if (rt.Contains(fx, fy)) {
return FWL_WGTHITTEST_Bottom;
}
- rt.Set(0, 0, m_fCYBorder + FWL_CornerEnlarge,
- m_fCXBorder + FWL_CornerEnlarge);
+ rt.Set(0, 0, m_fCYBorder + kCornerEnlarge, m_fCXBorder + kCornerEnlarge);
if (rt.Contains(fx, fy)) {
return FWL_WGTHITTEST_LeftTop;
}
- rt.Set(0, m_rtRelative.height - m_fCXBorder - FWL_CornerEnlarge,
- m_fCYBorder + FWL_CornerEnlarge, m_fCXBorder + FWL_CornerEnlarge);
+ rt.Set(0, m_rtRelative.height - m_fCXBorder - kCornerEnlarge,
+ m_fCYBorder + kCornerEnlarge, m_fCXBorder + kCornerEnlarge);
if (rt.Contains(fx, fy)) {
return FWL_WGTHITTEST_LeftBottom;
}
- rt.Set(m_rtRelative.width - m_fCYBorder - FWL_CornerEnlarge, 0,
- m_fCYBorder + FWL_CornerEnlarge, m_fCXBorder + FWL_CornerEnlarge);
+ rt.Set(m_rtRelative.width - m_fCYBorder - kCornerEnlarge, 0,
+ m_fCYBorder + kCornerEnlarge, m_fCXBorder + kCornerEnlarge);
if (rt.Contains(fx, fy)) {
return FWL_WGTHITTEST_RightTop;
}
- rt.Set(m_rtRelative.width - m_fCYBorder - FWL_CornerEnlarge,
- m_rtRelative.height - m_fCXBorder - FWL_CornerEnlarge,
- m_fCYBorder + FWL_CornerEnlarge, m_fCXBorder + FWL_CornerEnlarge);
+ rt.Set(m_rtRelative.width - m_fCYBorder - kCornerEnlarge,
+ m_rtRelative.height - m_fCXBorder - kCornerEnlarge,
+ m_fCYBorder + kCornerEnlarge, m_fCXBorder + kCornerEnlarge);
if (rt.Contains(fx, fy)) {
return FWL_WGTHITTEST_RightBottom;
}