summaryrefslogtreecommitdiff
path: root/xfa
diff options
context:
space:
mode:
Diffstat (limited to 'xfa')
-rw-r--r--xfa/src/fxfa/src/app/xfa_ffcheckbutton.cpp4
-rw-r--r--xfa/src/fxfa/src/app/xfa_ffcheckbutton.h2
-rw-r--r--xfa/src/fxfa/src/app/xfa_fffield.cpp6
-rw-r--r--xfa/src/fxfa/src/app/xfa_fffield.h2
-rw-r--r--xfa/src/fxfa/src/app/xfa_ffnotify.cpp4
-rw-r--r--xfa/src/fxfa/src/app/xfa_ffpushbutton.cpp4
-rw-r--r--xfa/src/fxfa/src/app/xfa_ffpushbutton.h2
-rw-r--r--xfa/src/fxfa/src/app/xfa_fftext.cpp4
-rw-r--r--xfa/src/fxfa/src/app/xfa_fftext.h2
-rw-r--r--xfa/src/fxfa/src/app/xfa_ffwidget.cpp5
-rw-r--r--xfa/src/fxfa/src/app/xfa_ffwidget.h2
11 files changed, 18 insertions, 19 deletions
diff --git a/xfa/src/fxfa/src/app/xfa_ffcheckbutton.cpp b/xfa/src/fxfa/src/app/xfa_ffcheckbutton.cpp
index 59c9323956..9de1039010 100644
--- a/xfa/src/fxfa/src/app/xfa_ffcheckbutton.cpp
+++ b/xfa/src/fxfa/src/app/xfa_ffcheckbutton.cpp
@@ -81,8 +81,8 @@ void CXFA_FFCheckButton::UpdateWidgetProperty() {
pCheckBox->ModifyStylesEx(
dwStyleEx, FWL_STYLEEXT_CKB_SignShapeMask | FWL_STYLEEXT_CKB_3State);
}
-FX_BOOL CXFA_FFCheckButton::LayoutWidget() {
- CXFA_FFWidget::LayoutWidget();
+FX_BOOL CXFA_FFCheckButton::PerformLayout() {
+ CXFA_FFWidget::PerformLayout();
FX_FLOAT fCheckSize = m_pDataAcc->GetCheckButtonSize();
CXFA_Margin mgWidget = m_pDataAcc->GetMargin();
CFX_RectF rtWidget;
diff --git a/xfa/src/fxfa/src/app/xfa_ffcheckbutton.h b/xfa/src/fxfa/src/app/xfa_ffcheckbutton.h
index 7d56a2b701..ebb02a6121 100644
--- a/xfa/src/fxfa/src/app/xfa_ffcheckbutton.h
+++ b/xfa/src/fxfa/src/app/xfa_ffcheckbutton.h
@@ -17,7 +17,7 @@ class CXFA_FFCheckButton : public CXFA_FFField {
int32_t iRotate = 0);
virtual FX_BOOL LoadWidget();
- virtual FX_BOOL LayoutWidget();
+ virtual FX_BOOL PerformLayout();
virtual FX_BOOL UpdateFWLData();
virtual void UpdateWidgetProperty();
virtual FX_BOOL OnLButtonUp(FX_DWORD dwFlags, FX_FLOAT fx, FX_FLOAT fy);
diff --git a/xfa/src/fxfa/src/app/xfa_fffield.cpp b/xfa/src/fxfa/src/app/xfa_fffield.cpp
index 22d1bf1791..45d8d69c8c 100644
--- a/xfa/src/fxfa/src/app/xfa_fffield.cpp
+++ b/xfa/src/fxfa/src/app/xfa_fffield.cpp
@@ -123,7 +123,7 @@ FX_BOOL CXFA_FFField::IsLoaded() {
FX_BOOL CXFA_FFField::LoadWidget() {
SetFWLThemeProvider();
m_pDataAcc->LoadCaption();
- LayoutWidget();
+ PerformLayout();
return TRUE;
}
void CXFA_FFField::UnloadWidget() {
@@ -148,8 +148,8 @@ void CXFA_FFField::SetEditScrollOffset() {
((CFWL_Edit*)m_pNormalWidget)->SetScrollOffset(fScrollOffset);
}
}
-FX_BOOL CXFA_FFField::LayoutWidget() {
- CXFA_FFWidget::LayoutWidget();
+FX_BOOL CXFA_FFField::PerformLayout() {
+ CXFA_FFWidget::PerformLayout();
CapPlacement();
LayoutCaption();
SetFWLRect();
diff --git a/xfa/src/fxfa/src/app/xfa_fffield.h b/xfa/src/fxfa/src/app/xfa_fffield.h
index e9c19167dd..4f7b5957cd 100644
--- a/xfa/src/fxfa/src/app/xfa_fffield.h
+++ b/xfa/src/fxfa/src/app/xfa_fffield.h
@@ -24,7 +24,7 @@ class CXFA_FFField : public CXFA_FFWidget, public IFWL_WidgetDelegate {
virtual FX_BOOL IsLoaded();
virtual FX_BOOL LoadWidget();
virtual void UnloadWidget();
- virtual FX_BOOL LayoutWidget();
+ virtual FX_BOOL PerformLayout();
virtual void UpdateFWL();
FX_DWORD UpdateUIProperty();
virtual FX_BOOL OnMouseEnter();
diff --git a/xfa/src/fxfa/src/app/xfa_ffnotify.cpp b/xfa/src/fxfa/src/app/xfa_ffnotify.cpp
index 188332c2dd..b2aef0be80 100644
--- a/xfa/src/fxfa/src/app/xfa_ffnotify.cpp
+++ b/xfa/src/fxfa/src/app/xfa_ffnotify.cpp
@@ -530,7 +530,7 @@ void CXFA_FFNotify::OnValueChanged(CXFA_Node* pSender,
if (bUpdateProperty) {
pWidget->UpdateWidgetProperty();
}
- pWidget->LayoutWidget();
+ pWidget->PerformLayout();
pWidget->AddInvalidateRect();
}
} else {
@@ -598,7 +598,7 @@ void CXFA_FFNotify::OnLayoutItemAdd(CXFA_FFDocView* pDocView,
pWidget->GetWidgetRect(rtOld);
CFX_RectF rtNew = pWidget->ReCacheWidgetRect();
if (rtOld != rtNew) {
- pWidget->LayoutWidget();
+ pWidget->PerformLayout();
}
} else {
pWidget->LoadWidget();
diff --git a/xfa/src/fxfa/src/app/xfa_ffpushbutton.cpp b/xfa/src/fxfa/src/app/xfa_ffpushbutton.cpp
index 0c31fb18f2..8efa450865 100644
--- a/xfa/src/fxfa/src/app/xfa_ffpushbutton.cpp
+++ b/xfa/src/fxfa/src/app/xfa_ffpushbutton.cpp
@@ -100,8 +100,8 @@ void CXFA_FFPushButton::UnloadWidget() {
}
CXFA_FFField::UnloadWidget();
}
-FX_BOOL CXFA_FFPushButton::LayoutWidget() {
- CXFA_FFWidget::LayoutWidget();
+FX_BOOL CXFA_FFPushButton::PerformLayout() {
+ CXFA_FFWidget::PerformLayout();
CFX_RectF rtWidget;
GetRectWithoutRotate(rtWidget);
m_rtUI = rtWidget;
diff --git a/xfa/src/fxfa/src/app/xfa_ffpushbutton.h b/xfa/src/fxfa/src/app/xfa_ffpushbutton.h
index 3a6938e783..ca9c4327cd 100644
--- a/xfa/src/fxfa/src/app/xfa_ffpushbutton.h
+++ b/xfa/src/fxfa/src/app/xfa_ffpushbutton.h
@@ -20,7 +20,7 @@ class CXFA_FFPushButton : public CXFA_FFField {
int32_t iRotate = 0);
virtual FX_BOOL LoadWidget();
virtual void UnloadWidget();
- virtual FX_BOOL LayoutWidget();
+ virtual FX_BOOL PerformLayout();
virtual void UpdateWidgetProperty();
virtual int32_t OnProcessMessage(CFWL_Message* pMessage);
virtual FWL_ERR OnProcessEvent(CFWL_Event* pEvent);
diff --git a/xfa/src/fxfa/src/app/xfa_fftext.cpp b/xfa/src/fxfa/src/app/xfa_fftext.cpp
index 15719190ca..0f3cea3647 100644
--- a/xfa/src/fxfa/src/app/xfa_fftext.cpp
+++ b/xfa/src/fxfa/src/app/xfa_fftext.cpp
@@ -64,8 +64,8 @@ FX_BOOL CXFA_FFText::IsLoaded() {
CXFA_TextLayout* pTextLayout = m_pDataAcc->GetTextLayout();
return pTextLayout != NULL && !pTextLayout->m_bHasBlock;
}
-FX_BOOL CXFA_FFText::LayoutWidget() {
- CXFA_FFDraw::LayoutWidget();
+FX_BOOL CXFA_FFText::PerformLayout() {
+ CXFA_FFDraw::PerformLayout();
CXFA_TextLayout* pTextLayout = m_pDataAcc->GetTextLayout();
if (!pTextLayout) {
return FALSE;
diff --git a/xfa/src/fxfa/src/app/xfa_fftext.h b/xfa/src/fxfa/src/app/xfa_fftext.h
index cd96fa74f8..1fe4a6e3e7 100644
--- a/xfa/src/fxfa/src/app/xfa_fftext.h
+++ b/xfa/src/fxfa/src/app/xfa_fftext.h
@@ -20,7 +20,7 @@ class CXFA_FFText : public CXFA_FFDraw {
FX_DWORD dwStatus = 0,
int32_t iRotate = 0);
virtual FX_BOOL IsLoaded();
- virtual FX_BOOL LayoutWidget();
+ virtual FX_BOOL PerformLayout();
private:
virtual const FX_WCHAR* GetLinkURLAtPoint(FX_FLOAT fx, FX_FLOAT fy);
diff --git a/xfa/src/fxfa/src/app/xfa_ffwidget.cpp b/xfa/src/fxfa/src/app/xfa_ffwidget.cpp
index ed9bbb329b..0c37dc5f68 100644
--- a/xfa/src/fxfa/src/app/xfa_ffwidget.cpp
+++ b/xfa/src/fxfa/src/app/xfa_ffwidget.cpp
@@ -115,12 +115,11 @@ FX_BOOL CXFA_FFWidget::IsLoaded() {
return m_pPageView != NULL;
}
FX_BOOL CXFA_FFWidget::LoadWidget() {
- LayoutWidget();
- ;
+ PerformLayout();
return TRUE;
}
void CXFA_FFWidget::UnloadWidget() {}
-FX_BOOL CXFA_FFWidget::LayoutWidget() {
+FX_BOOL CXFA_FFWidget::PerformLayout() {
ReCacheWidgetRect();
return TRUE;
}
diff --git a/xfa/src/fxfa/src/app/xfa_ffwidget.h b/xfa/src/fxfa/src/app/xfa_ffwidget.h
index 87c15ae46f..500a23f035 100644
--- a/xfa/src/fxfa/src/app/xfa_ffwidget.h
+++ b/xfa/src/fxfa/src/app/xfa_ffwidget.h
@@ -61,7 +61,7 @@ class CXFA_FFWidget : public IXFA_Widget,
virtual FX_BOOL IsLoaded();
virtual FX_BOOL LoadWidget();
virtual void UnloadWidget();
- virtual FX_BOOL LayoutWidget();
+ virtual FX_BOOL PerformLayout();
virtual FX_BOOL UpdateFWLData();
virtual void UpdateWidgetProperty();
virtual FX_BOOL OnMouseEnter();
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-10 06:17:47 +0000