Replace dwStatus arguments with specific enums
Because only one of the N bitflags is relevant in a given context,
and it is too easy to pass the wrong values.
Remove dwStatus argument from GetBBox(), it is not used and was
being passed inconsistently by callers. Also replace one boolean
bEllipse in CFXA_FFField with a better enum.
Change-Id: Ibec07f1ce64b5a5965889b8505649d8b271d6fae
Reviewed-on: https://pdfium-review.googlesource.com/c/pdfium/+/53055
Reviewed-by: Lei Zhang <thestig@chromium.org>
Commit-Queue: Tom Sepez <tsepez@chromium.org>
diff --git a/fpdfsdk/cpdfsdk_xfawidgethandler.cpp b/fpdfsdk/cpdfsdk_xfawidgethandler.cpp
index 219e1de..deeff6e 100644
--- a/fpdfsdk/cpdfsdk_xfawidgethandler.cpp
+++ b/fpdfsdk/cpdfsdk_xfawidgethandler.cpp
@@ -80,21 +80,14 @@
CXFA_Node* node = pAnnot->GetXFAWidget()->GetNode();
ASSERT(node->IsWidgetReady());
- CFX_RectF rcBBox;
- if (node->GetFFWidgetType() == XFA_FFWidgetType::kSignature) {
- rcBBox = pAnnot->GetXFAWidget()->GetBBox(XFA_WidgetStatus_Visible,
- CXFA_FFWidget::kDrawFocus);
- } else {
- rcBBox = pAnnot->GetXFAWidget()->GetBBox(XFA_WidgetStatus_None,
- CXFA_FFWidget::kDoNotDrawFocus);
- }
+ CFX_RectF rcBBox = pAnnot->GetXFAWidget()->GetBBox(
+ node->GetFFWidgetType() == XFA_FFWidgetType::kSignature
+ ? CXFA_FFWidget::kDrawFocus
+ : CXFA_FFWidget::kDoNotDrawFocus);
+
CFX_FloatRect rcWidget(rcBBox.left, rcBBox.top, rcBBox.left + rcBBox.width,
rcBBox.top + rcBBox.height);
- rcWidget.left -= 1.0f;
- rcWidget.right += 1.0f;
- rcWidget.bottom -= 1.0f;
- rcWidget.top += 1.0f;
-
+ rcWidget.Inflate(1.0f, 1.0f);
return rcWidget;
}
diff --git a/xfa/fxfa/cxfa_ffarc.cpp b/xfa/fxfa/cxfa_ffarc.cpp
index c7380ad..5b26e92 100644
--- a/xfa/fxfa/cxfa_ffarc.cpp
+++ b/xfa/fxfa/cxfa_ffarc.cpp
@@ -15,7 +15,7 @@
void CXFA_FFArc::RenderWidget(CXFA_Graphics* pGS,
const CFX_Matrix& matrix,
- uint32_t dwStatus) {
+ HighlightOption highlight) {
if (!HasVisibleStatus())
return;
diff --git a/xfa/fxfa/cxfa_ffarc.h b/xfa/fxfa/cxfa_ffarc.h
index 908ba0a..022e25e 100644
--- a/xfa/fxfa/cxfa_ffarc.h
+++ b/xfa/fxfa/cxfa_ffarc.h
@@ -17,7 +17,7 @@
// CXFA_FFWidget
void RenderWidget(CXFA_Graphics* pGS,
const CFX_Matrix& matrix,
- uint32_t dwStatus) override;
+ HighlightOption highlight) override;
};
#endif // XFA_FXFA_CXFA_FFARC_H_
diff --git a/xfa/fxfa/cxfa_ffbarcode.cpp b/xfa/fxfa/cxfa_ffbarcode.cpp
index e4b814a..7635877 100644
--- a/xfa/fxfa/cxfa_ffbarcode.cpp
+++ b/xfa/fxfa/cxfa_ffbarcode.cpp
@@ -135,14 +135,14 @@
void CXFA_FFBarcode::RenderWidget(CXFA_Graphics* pGS,
const CFX_Matrix& matrix,
- uint32_t dwStatus) {
+ HighlightOption highlight) {
if (!HasVisibleStatus())
return;
CFX_Matrix mtRotate = GetRotateMatrix();
mtRotate.Concat(matrix);
- CXFA_FFWidget::RenderWidget(pGS, mtRotate, dwStatus);
+ CXFA_FFWidget::RenderWidget(pGS, mtRotate, highlight);
DrawBorder(pGS, m_pNode->GetUIBorder(), m_rtUI, mtRotate);
RenderCaption(pGS, &mtRotate);
CFX_RectF rtWidget = m_pNormalWidget->GetWidgetRect();
diff --git a/xfa/fxfa/cxfa_ffbarcode.h b/xfa/fxfa/cxfa_ffbarcode.h
index e7a39f8..f51d48d 100644
--- a/xfa/fxfa/cxfa_ffbarcode.h
+++ b/xfa/fxfa/cxfa_ffbarcode.h
@@ -97,7 +97,7 @@
bool LoadWidget() override;
void RenderWidget(CXFA_Graphics* pGS,
const CFX_Matrix& matrix,
- uint32_t dwStatus) override;
+ HighlightOption highlight) override;
void UpdateWidgetProperty() override;
bool AcceptsFocusOnButtonDown(uint32_t dwFlags,
const CFX_PointF& point,
diff --git a/xfa/fxfa/cxfa_ffcheckbutton.cpp b/xfa/fxfa/cxfa_ffcheckbutton.cpp
index a208e21..19d5a40 100644
--- a/xfa/fxfa/cxfa_ffcheckbutton.cpp
+++ b/xfa/fxfa/cxfa_ffcheckbutton.cpp
@@ -226,18 +226,19 @@
void CXFA_FFCheckButton::RenderWidget(CXFA_Graphics* pGS,
const CFX_Matrix& matrix,
- uint32_t dwStatus) {
+ HighlightOption highlight) {
if (!HasVisibleStatus())
return;
CFX_Matrix mtRotate = GetRotateMatrix();
mtRotate.Concat(matrix);
- CXFA_FFWidget::RenderWidget(pGS, mtRotate, dwStatus);
+ CXFA_FFWidget::RenderWidget(pGS, mtRotate, highlight);
DrawBorderWithFlag(pGS, m_pNode->GetUIBorder(), m_rtUI, mtRotate,
button_->IsRound());
RenderCaption(pGS, &mtRotate);
- DrawHighlight(pGS, &mtRotate, dwStatus, button_->IsRound());
+ DrawHighlight(pGS, &mtRotate, highlight,
+ button_->IsRound() ? kRoundShape : kSquareShape);
CFX_Matrix mt(1, 0, 0, 1, m_rtCheckBox.left, m_rtCheckBox.top);
mt.Concat(mtRotate);
GetApp()->GetFWLWidgetMgr()->OnDrawWidget(m_pNormalWidget.get(), pGS, mt);
diff --git a/xfa/fxfa/cxfa_ffcheckbutton.h b/xfa/fxfa/cxfa_ffcheckbutton.h
index 2a68a19..c8a2d56 100644
--- a/xfa/fxfa/cxfa_ffcheckbutton.h
+++ b/xfa/fxfa/cxfa_ffcheckbutton.h
@@ -22,7 +22,7 @@
// CXFA_FFField
void RenderWidget(CXFA_Graphics* pGS,
const CFX_Matrix& matrix,
- uint32_t dwStatus) override;
+ HighlightOption highlight) override;
bool LoadWidget() override;
bool PerformLayout() override;
diff --git a/xfa/fxfa/cxfa_ffcombobox.cpp b/xfa/fxfa/cxfa_ffcombobox.cpp
index dd74856..0d8c7e6 100644
--- a/xfa/fxfa/cxfa_ffcombobox.cpp
+++ b/xfa/fxfa/cxfa_ffcombobox.cpp
@@ -30,10 +30,10 @@
CXFA_FFComboBox::~CXFA_FFComboBox() {}
-CFX_RectF CXFA_FFComboBox::GetBBox(uint32_t dwStatus, FocusOption focus) {
+CFX_RectF CXFA_FFComboBox::GetBBox(FocusOption focus) {
if (focus == kDrawFocus)
return CFX_RectF();
- return CXFA_FFWidget::GetBBox(dwStatus, kDoNotDrawFocus);
+ return CXFA_FFWidget::GetBBox(kDoNotDrawFocus);
}
bool CXFA_FFComboBox::PtInActiveRect(const CFX_PointF& point) {
diff --git a/xfa/fxfa/cxfa_ffcombobox.h b/xfa/fxfa/cxfa_ffcombobox.h
index d68b61c..96ed66c 100644
--- a/xfa/fxfa/cxfa_ffcombobox.h
+++ b/xfa/fxfa/cxfa_ffcombobox.h
@@ -18,7 +18,7 @@
~CXFA_FFComboBox() override;
// CXFA_FFField
- CFX_RectF GetBBox(uint32_t dwStatus, FocusOption focus) override;
+ CFX_RectF GetBBox(FocusOption focus) override;
bool LoadWidget() override;
void UpdateWidgetProperty() override;
bool OnRButtonUp(uint32_t dwFlags, const CFX_PointF& point) override;
diff --git a/xfa/fxfa/cxfa_ffdatetimeedit.cpp b/xfa/fxfa/cxfa_ffdatetimeedit.cpp
index 32ab1ab..9391f25 100644
--- a/xfa/fxfa/cxfa_ffdatetimeedit.cpp
+++ b/xfa/fxfa/cxfa_ffdatetimeedit.cpp
@@ -29,10 +29,10 @@
return static_cast<CFWL_DateTimePicker*>(m_pNormalWidget.get());
}
-CFX_RectF CXFA_FFDateTimeEdit::GetBBox(uint32_t dwStatus, FocusOption focus) {
+CFX_RectF CXFA_FFDateTimeEdit::GetBBox(FocusOption focus) {
if (focus == kDrawFocus)
return CFX_RectF();
- return CXFA_FFWidget::GetBBox(dwStatus, kDoNotDrawFocus);
+ return CXFA_FFWidget::GetBBox(kDoNotDrawFocus);
}
bool CXFA_FFDateTimeEdit::PtInActiveRect(const CFX_PointF& point) {
diff --git a/xfa/fxfa/cxfa_ffdatetimeedit.h b/xfa/fxfa/cxfa_ffdatetimeedit.h
index 64a6ef0..5ba6867 100644
--- a/xfa/fxfa/cxfa_ffdatetimeedit.h
+++ b/xfa/fxfa/cxfa_ffdatetimeedit.h
@@ -26,7 +26,7 @@
~CXFA_FFDateTimeEdit() override;
// CXFA_FFTextEdit
- CFX_RectF GetBBox(uint32_t dwStatus, FocusOption focus) override;
+ CFX_RectF GetBBox(FocusOption focus) override;
bool LoadWidget() override;
void UpdateWidgetProperty() override;
void OnProcessEvent(CFWL_Event* pEvent) override;
diff --git a/xfa/fxfa/cxfa_ffexclgroup.cpp b/xfa/fxfa/cxfa_ffexclgroup.cpp
index fe12cf4..dc0b4c7 100644
--- a/xfa/fxfa/cxfa_ffexclgroup.cpp
+++ b/xfa/fxfa/cxfa_ffexclgroup.cpp
@@ -17,12 +17,12 @@
void CXFA_FFExclGroup::RenderWidget(CXFA_Graphics* pGS,
const CFX_Matrix& matrix,
- uint32_t dwStatus) {
+ HighlightOption highlight) {
if (!HasVisibleStatus())
return;
CFX_Matrix mtRotate = GetRotateMatrix();
mtRotate.Concat(matrix);
- CXFA_FFWidget::RenderWidget(pGS, mtRotate, dwStatus);
+ CXFA_FFWidget::RenderWidget(pGS, mtRotate, highlight);
}
diff --git a/xfa/fxfa/cxfa_ffexclgroup.h b/xfa/fxfa/cxfa_ffexclgroup.h
index 7b16248..a14e071 100644
--- a/xfa/fxfa/cxfa_ffexclgroup.h
+++ b/xfa/fxfa/cxfa_ffexclgroup.h
@@ -18,7 +18,7 @@
// CXFA_FFWidget
void RenderWidget(CXFA_Graphics* pGS,
const CFX_Matrix& matrix,
- uint32_t dwStatus) override;
+ HighlightOption highlight) override;
};
#endif // XFA_FXFA_CXFA_FFEXCLGROUP_H_
diff --git a/xfa/fxfa/cxfa_fffield.cpp b/xfa/fxfa/cxfa_fffield.cpp
index b12fbdd4..7e3d838 100644
--- a/xfa/fxfa/cxfa_fffield.cpp
+++ b/xfa/fxfa/cxfa_fffield.cpp
@@ -45,9 +45,9 @@
CXFA_FFField::~CXFA_FFField() = default;
-CFX_RectF CXFA_FFField::GetBBox(uint32_t dwStatus, FocusOption focus) {
+CFX_RectF CXFA_FFField::GetBBox(FocusOption focus) {
if (focus == kDoNotDrawFocus)
- return CXFA_FFWidget::GetBBox(dwStatus, kDoNotDrawFocus);
+ return CXFA_FFWidget::GetBBox(kDoNotDrawFocus);
switch (m_pNode->GetFFWidgetType()) {
case XFA_FFWidgetType::kButton:
@@ -63,17 +63,17 @@
void CXFA_FFField::RenderWidget(CXFA_Graphics* pGS,
const CFX_Matrix& matrix,
- uint32_t dwStatus) {
+ HighlightOption highlight) {
if (!HasVisibleStatus())
return;
CFX_Matrix mtRotate = GetRotateMatrix();
mtRotate.Concat(matrix);
- CXFA_FFWidget::RenderWidget(pGS, mtRotate, dwStatus);
+ CXFA_FFWidget::RenderWidget(pGS, mtRotate, highlight);
DrawBorder(pGS, m_pNode->GetUIBorder(), m_rtUI, mtRotate);
RenderCaption(pGS, &mtRotate);
- DrawHighlight(pGS, &mtRotate, dwStatus, false);
+ DrawHighlight(pGS, &mtRotate, highlight, kSquareShape);
CFX_RectF rtWidget = m_pNormalWidget->GetWidgetRect();
CFX_Matrix mt(1, 0, 0, 1, rtWidget.left, rtWidget.top);
@@ -83,18 +83,20 @@
void CXFA_FFField::DrawHighlight(CXFA_Graphics* pGS,
CFX_Matrix* pMatrix,
- uint32_t dwStatus,
- bool bEllipse) {
- if (m_rtUI.IsEmpty() || !GetDoc()->GetXFADoc()->IsInteractive())
- return;
- if (!(dwStatus & XFA_WidgetStatus_Highlight) || !m_pNode->IsOpenAccess())
+ HighlightOption highlight,
+ ShapeOption shape) {
+ if (highlight == kNoHighlight)
return;
+ if (m_rtUI.IsEmpty() || !GetDoc()->GetXFADoc()->IsInteractive() ||
+ !m_pNode->IsOpenAccess()) {
+ return;
+ }
CXFA_FFDoc* pDoc = GetDoc();
pGS->SetFillColor(
CXFA_GEColor(pDoc->GetDocEnvironment()->GetHighlightColor(pDoc)));
CXFA_GEPath path;
- if (bEllipse)
+ if (shape == kRoundShape)
path.AddEllipse(m_rtUI);
else
path.AddRectangle(m_rtUI.left, m_rtUI.top, m_rtUI.width, m_rtUI.height);
diff --git a/xfa/fxfa/cxfa_fffield.h b/xfa/fxfa/cxfa_fffield.h
index 8d11a27..4e89eb6b 100644
--- a/xfa/fxfa/cxfa_fffield.h
+++ b/xfa/fxfa/cxfa_fffield.h
@@ -21,14 +21,16 @@
class CXFA_FFField : public CXFA_FFWidget, public IFWL_WidgetDelegate {
public:
+ enum ShapeOption { kSquareShape = 0, kRoundShape };
+
explicit CXFA_FFField(CXFA_Node* pNode);
~CXFA_FFField() override;
// CXFA_FFWidget
- CFX_RectF GetBBox(uint32_t dwStatus, FocusOption focus) override;
+ CFX_RectF GetBBox(FocusOption focus) override;
void RenderWidget(CXFA_Graphics* pGS,
const CFX_Matrix& matrix,
- uint32_t dwStatus) override;
+ HighlightOption highlight) override;
bool IsLoaded() override;
bool LoadWidget() override;
bool PerformLayout() override;
@@ -82,8 +84,8 @@
virtual bool IsDataChanged();
void DrawHighlight(CXFA_Graphics* pGS,
CFX_Matrix* pMatrix,
- uint32_t dwStatus,
- bool bEllipse);
+ HighlightOption highlight,
+ ShapeOption shape);
void DrawFocus(CXFA_Graphics* pGS, CFX_Matrix* pMatrix);
void TranslateFWLMessage(CFWL_Message* pMessage);
void CapPlacement();
diff --git a/xfa/fxfa/cxfa_ffimage.cpp b/xfa/fxfa/cxfa_ffimage.cpp
index 23de617..eeb0e24 100644
--- a/xfa/fxfa/cxfa_ffimage.cpp
+++ b/xfa/fxfa/cxfa_ffimage.cpp
@@ -34,14 +34,14 @@
void CXFA_FFImage::RenderWidget(CXFA_Graphics* pGS,
const CFX_Matrix& matrix,
- uint32_t dwStatus) {
+ HighlightOption highlight) {
if (!HasVisibleStatus())
return;
CFX_Matrix mtRotate = GetRotateMatrix();
mtRotate.Concat(matrix);
- CXFA_FFWidget::RenderWidget(pGS, mtRotate, dwStatus);
+ CXFA_FFWidget::RenderWidget(pGS, mtRotate, highlight);
RetainPtr<CFX_DIBitmap> pDIBitmap = GetNode()->GetImageImage();
if (!pDIBitmap)
diff --git a/xfa/fxfa/cxfa_ffimage.h b/xfa/fxfa/cxfa_ffimage.h
index 655c679f..5d23f60 100644
--- a/xfa/fxfa/cxfa_ffimage.h
+++ b/xfa/fxfa/cxfa_ffimage.h
@@ -17,7 +17,7 @@
// CXFA_FFWidget
void RenderWidget(CXFA_Graphics* pGS,
const CFX_Matrix& matrix,
- uint32_t dwStatus) override;
+ HighlightOption highlight) override;
bool IsLoaded() override;
bool LoadWidget() override;
};
diff --git a/xfa/fxfa/cxfa_ffimageedit.cpp b/xfa/fxfa/cxfa_ffimageedit.cpp
index 52feb5e..2a18cc9 100644
--- a/xfa/fxfa/cxfa_ffimageedit.cpp
+++ b/xfa/fxfa/cxfa_ffimageedit.cpp
@@ -53,14 +53,14 @@
void CXFA_FFImageEdit::RenderWidget(CXFA_Graphics* pGS,
const CFX_Matrix& matrix,
- uint32_t dwStatus) {
+ HighlightOption highlight) {
if (!HasVisibleStatus())
return;
CFX_Matrix mtRotate = GetRotateMatrix();
mtRotate.Concat(matrix);
- CXFA_FFWidget::RenderWidget(pGS, mtRotate, dwStatus);
+ CXFA_FFWidget::RenderWidget(pGS, mtRotate, highlight);
DrawBorder(pGS, m_pNode->GetUIBorder(), m_rtUI, mtRotate);
RenderCaption(pGS, &mtRotate);
RetainPtr<CFX_DIBitmap> pDIBitmap = m_pNode->GetImageEditImage();
diff --git a/xfa/fxfa/cxfa_ffimageedit.h b/xfa/fxfa/cxfa_ffimageedit.h
index 0339448..839ad6e 100644
--- a/xfa/fxfa/cxfa_ffimageedit.h
+++ b/xfa/fxfa/cxfa_ffimageedit.h
@@ -18,7 +18,7 @@
// CXFA_FFField
void RenderWidget(CXFA_Graphics* pGS,
const CFX_Matrix& matrix,
- uint32_t dwStatus) override;
+ HighlightOption highlight) override;
bool LoadWidget() override;
bool AcceptsFocusOnButtonDown(uint32_t dwFlags,
const CFX_PointF& point,
diff --git a/xfa/fxfa/cxfa_ffline.cpp b/xfa/fxfa/cxfa_ffline.cpp
index 00552ea..ec51040 100644
--- a/xfa/fxfa/cxfa_ffline.cpp
+++ b/xfa/fxfa/cxfa_ffline.cpp
@@ -84,7 +84,7 @@
void CXFA_FFLine::RenderWidget(CXFA_Graphics* pGS,
const CFX_Matrix& matrix,
- uint32_t dwStatus) {
+ HighlightOption highlight) {
if (!HasVisibleStatus())
return;
diff --git a/xfa/fxfa/cxfa_ffline.h b/xfa/fxfa/cxfa_ffline.h
index 5828c31..62750d1 100644
--- a/xfa/fxfa/cxfa_ffline.h
+++ b/xfa/fxfa/cxfa_ffline.h
@@ -17,7 +17,7 @@
// CXFA_FFWidget
void RenderWidget(CXFA_Graphics* pGS,
const CFX_Matrix& matrix,
- uint32_t dwStatus) override;
+ HighlightOption highlight) override;
private:
void GetRectFromHand(CFX_RectF& rect,
diff --git a/xfa/fxfa/cxfa_ffpushbutton.cpp b/xfa/fxfa/cxfa_ffpushbutton.cpp
index 366fd04..e8d55af 100644
--- a/xfa/fxfa/cxfa_ffpushbutton.cpp
+++ b/xfa/fxfa/cxfa_ffpushbutton.cpp
@@ -32,14 +32,14 @@
void CXFA_FFPushButton::RenderWidget(CXFA_Graphics* pGS,
const CFX_Matrix& matrix,
- uint32_t dwStatus) {
+ HighlightOption highlight) {
if (!HasVisibleStatus())
return;
CFX_Matrix mtRotate = GetRotateMatrix();
mtRotate.Concat(matrix);
- CXFA_FFWidget::RenderWidget(pGS, mtRotate, dwStatus);
+ CXFA_FFWidget::RenderWidget(pGS, mtRotate, highlight);
RenderHighlightCaption(pGS, &mtRotate);
CFX_RectF rtWidget = GetRectWithoutRotate();
diff --git a/xfa/fxfa/cxfa_ffpushbutton.h b/xfa/fxfa/cxfa_ffpushbutton.h
index 604497a..d8cd2f4 100644
--- a/xfa/fxfa/cxfa_ffpushbutton.h
+++ b/xfa/fxfa/cxfa_ffpushbutton.h
@@ -28,7 +28,7 @@
// CXFA_FFField
void RenderWidget(CXFA_Graphics* pGS,
const CFX_Matrix& matrix,
- uint32_t dwStatus) override;
+ HighlightOption highlight) override;
bool LoadWidget() override;
bool PerformLayout() override;
void UpdateWidgetProperty() override;
diff --git a/xfa/fxfa/cxfa_ffrectangle.cpp b/xfa/fxfa/cxfa_ffrectangle.cpp
index 9a2635ba..ff5e576 100644
--- a/xfa/fxfa/cxfa_ffrectangle.cpp
+++ b/xfa/fxfa/cxfa_ffrectangle.cpp
@@ -15,7 +15,7 @@
void CXFA_FFRectangle::RenderWidget(CXFA_Graphics* pGS,
const CFX_Matrix& matrix,
- uint32_t dwStatus) {
+ HighlightOption highlight) {
if (!HasVisibleStatus())
return;
diff --git a/xfa/fxfa/cxfa_ffrectangle.h b/xfa/fxfa/cxfa_ffrectangle.h
index c1f5864..d78d5ff 100644
--- a/xfa/fxfa/cxfa_ffrectangle.h
+++ b/xfa/fxfa/cxfa_ffrectangle.h
@@ -17,7 +17,7 @@
// CXFA_FFWidget
void RenderWidget(CXFA_Graphics* pGS,
const CFX_Matrix& matrix,
- uint32_t dwStatus) override;
+ HighlightOption highlight) override;
};
#endif // XFA_FXFA_CXFA_FFRECTANGLE_H_
diff --git a/xfa/fxfa/cxfa_ffsignature.cpp b/xfa/fxfa/cxfa_ffsignature.cpp
index ab3f364..36e7fc4 100644
--- a/xfa/fxfa/cxfa_ffsignature.cpp
+++ b/xfa/fxfa/cxfa_ffsignature.cpp
@@ -22,18 +22,18 @@
void CXFA_FFSignature::RenderWidget(CXFA_Graphics* pGS,
const CFX_Matrix& matrix,
- uint32_t dwStatus) {
+ HighlightOption highlight) {
if (!HasVisibleStatus())
return;
CFX_Matrix mtRotate = GetRotateMatrix();
mtRotate.Concat(matrix);
- CXFA_FFWidget::RenderWidget(pGS, mtRotate, dwStatus);
+ CXFA_FFWidget::RenderWidget(pGS, mtRotate, highlight);
DrawBorder(pGS, m_pNode->GetUIBorder(), m_rtUI, mtRotate);
RenderCaption(pGS, &mtRotate);
- DrawHighlight(pGS, &mtRotate, dwStatus, false);
+ DrawHighlight(pGS, &mtRotate, highlight, kSquareShape);
}
bool CXFA_FFSignature::OnMouseEnter() {
diff --git a/xfa/fxfa/cxfa_ffsignature.h b/xfa/fxfa/cxfa_ffsignature.h
index b8a21d3..a08c0ac 100644
--- a/xfa/fxfa/cxfa_ffsignature.h
+++ b/xfa/fxfa/cxfa_ffsignature.h
@@ -17,7 +17,7 @@
// CXFA_FFField
void RenderWidget(CXFA_Graphics* pGS,
const CFX_Matrix& matrix,
- uint32_t dwStatus) override;
+ HighlightOption highlight) override;
bool LoadWidget() override;
bool OnMouseEnter() override;
bool OnMouseExit() override;
diff --git a/xfa/fxfa/cxfa_fftext.cpp b/xfa/fxfa/cxfa_fftext.cpp
index b0803d9..7cf30ea 100644
--- a/xfa/fxfa/cxfa_fftext.cpp
+++ b/xfa/fxfa/cxfa_fftext.cpp
@@ -25,14 +25,14 @@
void CXFA_FFText::RenderWidget(CXFA_Graphics* pGS,
const CFX_Matrix& matrix,
- uint32_t dwStatus) {
+ HighlightOption highlight) {
if (!HasVisibleStatus())
return;
CFX_Matrix mtRotate = GetRotateMatrix();
mtRotate.Concat(matrix);
- CXFA_FFWidget::RenderWidget(pGS, mtRotate, dwStatus);
+ CXFA_FFWidget::RenderWidget(pGS, mtRotate, highlight);
CXFA_TextLayout* pTextLayout = m_pNode->GetTextLayout();
if (!pTextLayout)
diff --git a/xfa/fxfa/cxfa_fftext.h b/xfa/fxfa/cxfa_fftext.h
index 7561fdc..bad1c87 100644
--- a/xfa/fxfa/cxfa_fftext.h
+++ b/xfa/fxfa/cxfa_fftext.h
@@ -24,7 +24,7 @@
FWL_WidgetHit OnHitTest(const CFX_PointF& point) override;
void RenderWidget(CXFA_Graphics* pGS,
const CFX_Matrix& matrix,
- uint32_t dwStatus) override;
+ HighlightOption highlight) override;
bool IsLoaded() override;
bool PerformLayout() override;
diff --git a/xfa/fxfa/cxfa_ffwidget.cpp b/xfa/fxfa/cxfa_ffwidget.cpp
index d3c60ae..125ebc0 100644
--- a/xfa/fxfa/cxfa_ffwidget.cpp
+++ b/xfa/fxfa/cxfa_ffwidget.cpp
@@ -286,7 +286,7 @@
(GetLayoutItem()->m_dwStatus & ~dwRemoved) | dwAdded;
}
-CFX_RectF CXFA_FFWidget::GetBBox(uint32_t dwStatus, FocusOption focus) {
+CFX_RectF CXFA_FFWidget::GetBBox(FocusOption focus) {
if (focus == kDrawFocus || !m_pPageView)
return CFX_RectF();
return m_pPageView->GetPageViewRect();
@@ -294,7 +294,7 @@
void CXFA_FFWidget::RenderWidget(CXFA_Graphics* pGS,
const CFX_Matrix& matrix,
- uint32_t dwStatus) {
+ HighlightOption highlight) {
if (!HasVisibleStatus())
return;
@@ -347,7 +347,7 @@
}
void CXFA_FFWidget::InvalidateRect() {
- CFX_RectF rtWidget = GetBBox(XFA_WidgetStatus_Focused, kDoNotDrawFocus);
+ CFX_RectF rtWidget = GetBBox(kDoNotDrawFocus);
rtWidget.Inflate(2, 2);
m_pDocView->InvalidateRect(m_pPageView.Get(), rtWidget);
}
diff --git a/xfa/fxfa/cxfa_ffwidget.h b/xfa/fxfa/cxfa_ffwidget.h
index 61f3756..ec68cff 100644
--- a/xfa/fxfa/cxfa_ffwidget.h
+++ b/xfa/fxfa/cxfa_ffwidget.h
@@ -64,14 +64,15 @@
class CXFA_FFWidget {
public:
enum FocusOption { kDoNotDrawFocus = 0, kDrawFocus };
+ enum HighlightOption { kNoHighlight = 0, kHighlight };
explicit CXFA_FFWidget(CXFA_Node* pNode);
virtual ~CXFA_FFWidget();
- virtual CFX_RectF GetBBox(uint32_t dwStatus, FocusOption focus);
+ virtual CFX_RectF GetBBox(FocusOption focus);
virtual void RenderWidget(CXFA_Graphics* pGS,
const CFX_Matrix& matrix,
- uint32_t dwStatus);
+ HighlightOption highlight);
virtual bool IsLoaded();
virtual bool LoadWidget();
virtual bool PerformLayout();
diff --git a/xfa/fxfa/cxfa_ffwidgethandler.cpp b/xfa/fxfa/cxfa_ffwidgethandler.cpp
index 842dc1f..809655d 100644
--- a/xfa/fxfa/cxfa_ffwidgethandler.cpp
+++ b/xfa/fxfa/cxfa_ffwidgethandler.cpp
@@ -198,8 +198,9 @@
CXFA_Graphics* pGS,
const CFX_Matrix& matrix,
bool bHighlight) {
- hWidget->RenderWidget(pGS, matrix,
- bHighlight ? XFA_WidgetStatus_Highlight : 0);
+ hWidget->RenderWidget(
+ pGS, matrix,
+ bHighlight ? CXFA_FFWidget::kHighlight : CXFA_FFWidget::kNoHighlight);
}
bool CXFA_FFWidgetHandler::HasEvent(CXFA_Node* pNode,
diff --git a/xfa/fxfa/cxfa_rendercontext.cpp b/xfa/fxfa/cxfa_rendercontext.cpp
index 041f87b..572cda5 100644
--- a/xfa/fxfa/cxfa_rendercontext.cpp
+++ b/xfa/fxfa/cxfa_rendercontext.cpp
@@ -23,12 +23,11 @@
void CXFA_RenderContext::DoRender(CXFA_Graphics* gs) {
while (m_pWidget) {
- CFX_RectF rtWidgetBox = m_pWidget->GetBBox(XFA_WidgetStatus_Visible,
- CXFA_FFWidget::kDoNotDrawFocus);
+ CFX_RectF rtWidgetBox = m_pWidget->GetBBox(CXFA_FFWidget::kDoNotDrawFocus);
++rtWidgetBox.width;
++rtWidgetBox.height;
if (rtWidgetBox.IntersectWith(m_rtClipRect))
- m_pWidget->RenderWidget(gs, m_matrix, XFA_WidgetStatus_Highlight);
+ m_pWidget->RenderWidget(gs, m_matrix, CXFA_FFWidget::kHighlight);
m_pWidget = m_pWidgetIterator->MoveToNext();
}
diff --git a/xfa/fxfa/fxfa.h b/xfa/fxfa/fxfa.h
index 9baef64..7b940ff 100644
--- a/xfa/fxfa/fxfa.h
+++ b/xfa/fxfa/fxfa.h
@@ -83,12 +83,11 @@
XFA_WidgetStatus_ButtonDown = 1 << 1,
XFA_WidgetStatus_Disabled = 1 << 2,
XFA_WidgetStatus_Focused = 1 << 3,
- XFA_WidgetStatus_Highlight = 1 << 4,
- XFA_WidgetStatus_Printable = 1 << 5,
- XFA_WidgetStatus_RectCached = 1 << 6,
- XFA_WidgetStatus_TextEditValueChanged = 1 << 7,
- XFA_WidgetStatus_Viewable = 1 << 8,
- XFA_WidgetStatus_Visible = 1 << 9
+ XFA_WidgetStatus_Printable = 1 << 4,
+ XFA_WidgetStatus_RectCached = 1 << 5,
+ XFA_WidgetStatus_TextEditValueChanged = 1 << 6,
+ XFA_WidgetStatus_Viewable = 1 << 7,
+ XFA_WidgetStatus_Visible = 1 << 8
};
enum XFA_WIDGETTYPE {
