Replace #define in cfwl_pushbutton with constexpr float.
Change-Id: I6801081b422528e317db185b036da4f775f8a5a5
Reviewed-on: https://pdfium-review.googlesource.com/c/pdfium/+/83551
Auto-Submit: Tom Sepez <tsepez@chromium.org>
Commit-Queue: Tom Sepez <tsepez@chromium.org>
Commit-Queue: Lei Zhang <thestig@chromium.org>
Reviewed-by: Lei Zhang <thestig@chromium.org>
diff --git a/xfa/fwl/theme/cfwl_pushbuttontp.cpp b/xfa/fwl/theme/cfwl_pushbuttontp.cpp
index 7a3c01c..9dbf0f6 100644
--- a/xfa/fwl/theme/cfwl_pushbuttontp.cpp
+++ b/xfa/fwl/theme/cfwl_pushbuttontp.cpp
@@ -14,7 +14,11 @@
#include "xfa/fwl/cfwl_widget.h"
#include "xfa/fwl/ifwl_themeprovider.h"
-#define PUSHBUTTON_SIZE_Corner 2
+namespace {
+
+constexpr float kPushbuttonSizeCorner = 2.0f;
+
+} // namespace
CFWL_PushButtonTP::CFWL_PushButtonTP() : m_pThemeData(new PBThemeData) {
SetThemeData();
@@ -35,19 +39,17 @@
CFGAS_GEPath strokePath;
strokePath.MoveTo(
- CFX_PointF(rect.left + PUSHBUTTON_SIZE_Corner, rect.top));
- strokePath.LineTo(CFX_PointF(fRight - PUSHBUTTON_SIZE_Corner, rect.top));
- strokePath.LineTo(CFX_PointF(fRight, rect.top + PUSHBUTTON_SIZE_Corner));
- strokePath.LineTo(CFX_PointF(fRight, fBottom - PUSHBUTTON_SIZE_Corner));
- strokePath.LineTo(CFX_PointF(fRight - PUSHBUTTON_SIZE_Corner, fBottom));
+ CFX_PointF(rect.left + kPushbuttonSizeCorner, rect.top));
+ strokePath.LineTo(CFX_PointF(fRight - kPushbuttonSizeCorner, rect.top));
+ strokePath.LineTo(CFX_PointF(fRight, rect.top + kPushbuttonSizeCorner));
+ strokePath.LineTo(CFX_PointF(fRight, fBottom - kPushbuttonSizeCorner));
+ strokePath.LineTo(CFX_PointF(fRight - kPushbuttonSizeCorner, fBottom));
+ strokePath.LineTo(CFX_PointF(rect.left + kPushbuttonSizeCorner, fBottom));
+ strokePath.LineTo(CFX_PointF(rect.left, fBottom - kPushbuttonSizeCorner));
strokePath.LineTo(
- CFX_PointF(rect.left + PUSHBUTTON_SIZE_Corner, fBottom));
+ CFX_PointF(rect.left, rect.top + kPushbuttonSizeCorner));
strokePath.LineTo(
- CFX_PointF(rect.left, fBottom - PUSHBUTTON_SIZE_Corner));
- strokePath.LineTo(
- CFX_PointF(rect.left, rect.top + PUSHBUTTON_SIZE_Corner));
- strokePath.LineTo(
- CFX_PointF(rect.left + PUSHBUTTON_SIZE_Corner, rect.top));
+ CFX_PointF(rect.left + kPushbuttonSizeCorner, rect.top));
CFGAS_GEPath fillPath;
fillPath.AddSubpath(strokePath);
@@ -56,8 +58,8 @@
pGraphics->SaveGraphState();
CFX_RectF rtInner(rect);
- rtInner.Deflate(PUSHBUTTON_SIZE_Corner + 1, PUSHBUTTON_SIZE_Corner + 1,
- PUSHBUTTON_SIZE_Corner, PUSHBUTTON_SIZE_Corner);
+ rtInner.Deflate(kPushbuttonSizeCorner + 1, kPushbuttonSizeCorner + 1,
+ kPushbuttonSizeCorner, kPushbuttonSizeCorner);
fillPath.AddRectangle(rtInner.left, rtInner.top, rtInner.width,
rtInner.height);