summaryrefslogtreecommitdiff
path: root/xfa/fxfa
diff options
context:
space:
mode:
Diffstat (limited to 'xfa/fxfa')
-rw-r--r--xfa/fxfa/cxfa_ffarc.cpp2
-rw-r--r--xfa/fxfa/cxfa_ffcheckbutton.cpp10
-rw-r--r--xfa/fxfa/cxfa_fffield.cpp8
-rw-r--r--xfa/fxfa/cxfa_ffimage.cpp2
-rw-r--r--xfa/fxfa/cxfa_ffline.cpp2
-rw-r--r--xfa/fxfa/cxfa_ffpushbutton.cpp4
-rw-r--r--xfa/fxfa/cxfa_ffrectangle.cpp2
-rw-r--r--xfa/fxfa/cxfa_fftext.cpp2
-rw-r--r--xfa/fxfa/cxfa_ffwidget.cpp6
-rw-r--r--xfa/fxfa/cxfa_ffwidget.h6
10 files changed, 21 insertions, 23 deletions
diff --git a/xfa/fxfa/cxfa_ffarc.cpp b/xfa/fxfa/cxfa_ffarc.cpp
index 0f6d69ead5..0fc8239983 100644
--- a/xfa/fxfa/cxfa_ffarc.cpp
+++ b/xfa/fxfa/cxfa_ffarc.cpp
@@ -26,7 +26,7 @@ void CXFA_FFArc::RenderWidget(CXFA_Graphics* pGS,
CFX_RectF rtArc = GetRectWithoutRotate();
CXFA_Margin* margin = m_pNode->GetMargin();
if (margin)
- XFA_RectWidthoutMargin(rtArc, margin);
+ XFA_RectWithoutMargin(rtArc, margin);
CFX_Matrix mtRotate = GetRotateMatrix();
mtRotate.Concat(matrix);
diff --git a/xfa/fxfa/cxfa_ffcheckbutton.cpp b/xfa/fxfa/cxfa_ffcheckbutton.cpp
index 0b5bf53ef5..001a3c1279 100644
--- a/xfa/fxfa/cxfa_ffcheckbutton.cpp
+++ b/xfa/fxfa/cxfa_ffcheckbutton.cpp
@@ -94,7 +94,7 @@ bool CXFA_FFCheckButton::PerformLayout() {
CXFA_Margin* margin = m_pNode->GetMargin();
CFX_RectF rtWidget = GetRectWithoutRotate();
if (margin)
- XFA_RectWidthoutMargin(rtWidget, margin);
+ XFA_RectWithoutMargin(rtWidget, margin);
XFA_AttributeEnum iCapPlacement = XFA_AttributeEnum::Unknown;
float fCapReserve = 0;
@@ -133,7 +133,7 @@ bool CXFA_FFCheckButton::PerformLayout() {
}
case XFA_AttributeEnum::Top: {
m_rtCaption.height = fCapReserve;
- XFA_RectWidthoutMargin(m_rtCaption, captionMargin);
+ XFA_RectWithoutMargin(m_rtCaption, captionMargin);
m_rtUI.height -= fCapReserve;
m_rtUI.top += fCapReserve;
break;
@@ -148,7 +148,7 @@ bool CXFA_FFCheckButton::PerformLayout() {
case XFA_AttributeEnum::Bottom: {
m_rtCaption.top = m_rtCaption.bottom() - fCapReserve;
m_rtCaption.height = fCapReserve;
- XFA_RectWidthoutMargin(m_rtCaption, captionMargin);
+ XFA_RectWithoutMargin(m_rtCaption, captionMargin);
m_rtUI.height -= fCapReserve;
break;
}
@@ -177,7 +177,7 @@ bool CXFA_FFCheckButton::PerformLayout() {
if (borderUI) {
CXFA_Margin* borderMargin = borderUI->GetMargin();
if (borderMargin)
- XFA_RectWidthoutMargin(m_rtUI, borderMargin);
+ XFA_RectWithoutMargin(m_rtUI, borderMargin);
}
m_rtUI.Normalize();
@@ -191,7 +191,7 @@ bool CXFA_FFCheckButton::PerformLayout() {
void CXFA_FFCheckButton::CapLeftRightPlacement(
const CXFA_Margin* captionMargin) {
- XFA_RectWidthoutMargin(m_rtCaption, captionMargin);
+ XFA_RectWithoutMargin(m_rtCaption, captionMargin);
if (m_rtCaption.height < 0)
m_rtCaption.top += m_rtCaption.height;
if (m_rtCaption.width < 0) {
diff --git a/xfa/fxfa/cxfa_fffield.cpp b/xfa/fxfa/cxfa_fffield.cpp
index fdc2b1c6ed..5988d5b876 100644
--- a/xfa/fxfa/cxfa_fffield.cpp
+++ b/xfa/fxfa/cxfa_fffield.cpp
@@ -211,7 +211,7 @@ void CXFA_FFField::CapPlacement() {
m_rtCaption.height += pItem->GetRect(false).Height();
pItem = pItem->GetNext();
}
- XFA_RectWidthoutMargin(m_rtCaption, margin);
+ XFA_RectWithoutMargin(m_rtCaption, margin);
}
CXFA_TextLayout* pCapTextLayout =
@@ -271,7 +271,7 @@ void CXFA_FFField::CapPlacement() {
if (borderUI) {
CXFA_Margin* borderMargin = borderUI->GetMargin();
if (borderMargin)
- XFA_RectWidthoutMargin(m_rtUI, borderMargin);
+ XFA_RectWithoutMargin(m_rtUI, borderMargin);
}
m_rtUI.Normalize();
}
@@ -282,7 +282,7 @@ void CXFA_FFField::CapTopBottomPlacement(const CXFA_Margin* margin,
CFX_RectF rtUIMargin = m_pNode->GetWidgetAcc()->GetUIMargin();
m_rtCaption.left += rtUIMargin.left;
if (margin) {
- XFA_RectWidthoutMargin(m_rtCaption, margin);
+ XFA_RectWithoutMargin(m_rtCaption, margin);
if (m_rtCaption.height < 0)
m_rtCaption.top += m_rtCaption.height;
}
@@ -309,7 +309,7 @@ void CXFA_FFField::CapLeftRightPlacement(const CXFA_Margin* margin,
m_rtCaption.top += rtUIMargin.top;
m_rtCaption.height -= rtUIMargin.top;
if (margin) {
- XFA_RectWidthoutMargin(m_rtCaption, margin);
+ XFA_RectWithoutMargin(m_rtCaption, margin);
if (m_rtCaption.height < 0)
m_rtCaption.top += m_rtCaption.height;
}
diff --git a/xfa/fxfa/cxfa_ffimage.cpp b/xfa/fxfa/cxfa_ffimage.cpp
index 5191d34858..946defb8d3 100644
--- a/xfa/fxfa/cxfa_ffimage.cpp
+++ b/xfa/fxfa/cxfa_ffimage.cpp
@@ -57,7 +57,7 @@ void CXFA_FFImage::RenderWidget(CXFA_Graphics* pGS,
CFX_RectF rtImage = GetRectWithoutRotate();
CXFA_Margin* margin = m_pNode->GetMargin();
if (margin)
- XFA_RectWidthoutMargin(rtImage, margin);
+ XFA_RectWithoutMargin(rtImage, margin);
XFA_AttributeEnum iHorzAlign = XFA_AttributeEnum::Left;
XFA_AttributeEnum iVertAlign = XFA_AttributeEnum::Top;
diff --git a/xfa/fxfa/cxfa_ffline.cpp b/xfa/fxfa/cxfa_ffline.cpp
index 3fe2538368..20f6552244 100644
--- a/xfa/fxfa/cxfa_ffline.cpp
+++ b/xfa/fxfa/cxfa_ffline.cpp
@@ -113,7 +113,7 @@ void CXFA_FFLine::RenderWidget(CXFA_Graphics* pGS,
CFX_RectF rtLine = GetRectWithoutRotate();
CXFA_Margin* margin = m_pNode->GetMargin();
if (margin)
- XFA_RectWidthoutMargin(rtLine, margin);
+ XFA_RectWithoutMargin(rtLine, margin);
GetRectFromHand(rtLine, line->GetHand(), fLineWidth);
CXFA_GEPath linePath;
diff --git a/xfa/fxfa/cxfa_ffpushbutton.cpp b/xfa/fxfa/cxfa_ffpushbutton.cpp
index 62d692469d..4bcd1553b9 100644
--- a/xfa/fxfa/cxfa_ffpushbutton.cpp
+++ b/xfa/fxfa/cxfa_ffpushbutton.cpp
@@ -102,14 +102,14 @@ bool CXFA_FFPushButton::PerformLayout() {
m_rtUI = rtWidget;
CXFA_Margin* margin = m_pNode->GetMargin();
if (margin)
- XFA_RectWidthoutMargin(rtWidget, margin);
+ XFA_RectWithoutMargin(rtWidget, margin);
m_rtCaption = rtWidget;
CXFA_Caption* caption = m_pNode->GetCaptionIfExists();
CXFA_Margin* captionMargin = caption ? caption->GetMargin() : nullptr;
if (captionMargin)
- XFA_RectWidthoutMargin(m_rtCaption, captionMargin);
+ XFA_RectWithoutMargin(m_rtCaption, captionMargin);
LayoutHighlightCaption();
SetFWLRect();
diff --git a/xfa/fxfa/cxfa_ffrectangle.cpp b/xfa/fxfa/cxfa_ffrectangle.cpp
index 1e27902a78..f3f2a5a2b2 100644
--- a/xfa/fxfa/cxfa_ffrectangle.cpp
+++ b/xfa/fxfa/cxfa_ffrectangle.cpp
@@ -26,7 +26,7 @@ void CXFA_FFRectangle::RenderWidget(CXFA_Graphics* pGS,
CFX_RectF rect = GetRectWithoutRotate();
CXFA_Margin* margin = m_pNode->GetMargin();
if (margin)
- XFA_RectWidthoutMargin(rect, margin);
+ XFA_RectWithoutMargin(rect, margin);
CFX_Matrix mtRotate = GetRotateMatrix();
mtRotate.Concat(matrix);
diff --git a/xfa/fxfa/cxfa_fftext.cpp b/xfa/fxfa/cxfa_fftext.cpp
index e395621760..b2ec840504 100644
--- a/xfa/fxfa/cxfa_fftext.cpp
+++ b/xfa/fxfa/cxfa_fftext.cpp
@@ -45,7 +45,7 @@ void CXFA_FFText::RenderWidget(CXFA_Graphics* pGS,
if (margin) {
CXFA_LayoutItem* pItem = this;
if (!pItem->GetPrev() && !pItem->GetNext()) {
- XFA_RectWidthoutMargin(rtText, margin);
+ XFA_RectWithoutMargin(rtText, margin);
} else {
float fTopInset = 0;
float fBottomInset = 0;
diff --git a/xfa/fxfa/cxfa_ffwidget.cpp b/xfa/fxfa/cxfa_ffwidget.cpp
index 20719519a4..cff0697c82 100644
--- a/xfa/fxfa/cxfa_ffwidget.cpp
+++ b/xfa/fxfa/cxfa_ffwidget.cpp
@@ -989,7 +989,7 @@ void CXFA_FFWidget::RenderWidget(CXFA_Graphics* pGS,
CFX_RectF rtBorder = GetRectWithoutRotate();
CXFA_Margin* margin = border->GetMargin();
if (margin)
- XFA_RectWidthoutMargin(rtBorder, margin);
+ XFA_RectWithoutMargin(rtBorder, margin);
rtBorder.Normalize();
DrawBorder(pGS, border, rtBorder, matrix);
@@ -2013,9 +2013,7 @@ RetainPtr<CFX_DIBitmap> XFA_LoadImageFromBuffer(
return pBitmap;
}
-void XFA_RectWidthoutMargin(CFX_RectF& rt,
- const CXFA_Margin* margin,
- bool bUI) {
+void XFA_RectWithoutMargin(CFX_RectF& rt, const CXFA_Margin* margin, bool bUI) {
if (!margin)
return;
diff --git a/xfa/fxfa/cxfa_ffwidget.h b/xfa/fxfa/cxfa_ffwidget.h
index 5857800ba9..50b540635f 100644
--- a/xfa/fxfa/cxfa_ffwidget.h
+++ b/xfa/fxfa/cxfa_ffwidget.h
@@ -64,9 +64,9 @@ RetainPtr<CFX_DIBitmap> XFA_LoadImageFromBuffer(
FXCODEC_IMAGE_TYPE XFA_GetImageType(const WideString& wsType);
char* XFA_Base64Encode(const uint8_t* buf, int32_t buf_len);
-void XFA_RectWidthoutMargin(CFX_RectF& rt,
- const CXFA_Margin* margin,
- bool bUI = false);
+void XFA_RectWithoutMargin(CFX_RectF& rt,
+ const CXFA_Margin* margin,
+ bool bUI = false);
CXFA_FFWidget* XFA_GetWidgetFromLayoutItem(CXFA_LayoutItem* pLayoutItem);
bool XFA_IsCreateWidget(XFA_Element iType);
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-01 07:32:06 +0000