diff options
Diffstat (limited to 'xfa/fwl')
54 files changed, 246 insertions, 244 deletions
diff --git a/xfa/fwl/cfwl_barcode.cpp b/xfa/fwl/cfwl_barcode.cpp index 378bb8e06b..b51bb24366 100644 --- a/xfa/fwl/cfwl_barcode.cpp +++ b/xfa/fwl/cfwl_barcode.cpp @@ -35,7 +35,7 @@ void CFWL_Barcode::Update() { GenerateBarcodeImageCache(); } -void CFWL_Barcode::DrawWidget(CFX_Graphics* pGraphics, +void CFWL_Barcode::DrawWidget(CXFA_Graphics* pGraphics, const CFX_Matrix* pMatrix) { if (!pGraphics) return; diff --git a/xfa/fwl/cfwl_barcode.h b/xfa/fwl/cfwl_barcode.h index 0620541c2f..c913a17b10 100644 --- a/xfa/fwl/cfwl_barcode.h +++ b/xfa/fwl/cfwl_barcode.h @@ -45,7 +45,7 @@ class CFWL_Barcode : public CFWL_Edit { // CFWL_Widget FWL_Type GetClassID() const override; void Update() override; - void DrawWidget(CFX_Graphics* pGraphics, const CFX_Matrix* pMatrix) override; + void DrawWidget(CXFA_Graphics* pGraphics, const CFX_Matrix* pMatrix) override; void OnProcessEvent(CFWL_Event* pEvent) override; // CFWL_Edit diff --git a/xfa/fwl/cfwl_caret.cpp b/xfa/fwl/cfwl_caret.cpp index 21387a47f9..be7ecbf331 100644 --- a/xfa/fwl/cfwl_caret.cpp +++ b/xfa/fwl/cfwl_caret.cpp @@ -43,7 +43,7 @@ FWL_Type CFWL_Caret::GetClassID() const { void CFWL_Caret::Update() {} -void CFWL_Caret::DrawWidget(CFX_Graphics* pGraphics, +void CFWL_Caret::DrawWidget(CXFA_Graphics* pGraphics, const CFX_Matrix* pMatrix) { if (!pGraphics) return; @@ -70,7 +70,7 @@ void CFWL_Caret::HideCaret() { SetStates(FWL_WGTSTATE_Invisible); } -void CFWL_Caret::DrawCaretBK(CFX_Graphics* pGraphics, +void CFWL_Caret::DrawCaretBK(CXFA_Graphics* pGraphics, IFWL_ThemeProvider* pTheme, const CFX_Matrix* pMatrix) { if (!(m_pProperties->m_dwStates & FWL_STATE_CAT_HightLight)) @@ -89,7 +89,7 @@ void CFWL_Caret::DrawCaretBK(CFX_Graphics* pGraphics, void CFWL_Caret::OnProcessMessage(CFWL_Message* pMessage) {} -void CFWL_Caret::OnDrawWidget(CFX_Graphics* pGraphics, +void CFWL_Caret::OnDrawWidget(CXFA_Graphics* pGraphics, const CFX_Matrix* pMatrix) { DrawWidget(pGraphics, pMatrix); } diff --git a/xfa/fwl/cfwl_caret.h b/xfa/fwl/cfwl_caret.h index ce692532db..d00f38a29c 100644 --- a/xfa/fwl/cfwl_caret.h +++ b/xfa/fwl/cfwl_caret.h @@ -27,9 +27,9 @@ class CFWL_Caret : public CFWL_Widget { // CFWL_Widget FWL_Type GetClassID() const override; - void DrawWidget(CFX_Graphics* pGraphics, const CFX_Matrix* pMatrix) override; + void DrawWidget(CXFA_Graphics* pGraphics, const CFX_Matrix* pMatrix) override; void OnProcessMessage(CFWL_Message* pMessage) override; - void OnDrawWidget(CFX_Graphics* pGraphics, + void OnDrawWidget(CXFA_Graphics* pGraphics, const CFX_Matrix* pMatrix) override; void Update() override; @@ -46,7 +46,7 @@ class CFWL_Caret : public CFWL_Widget { }; friend class CFWL_Caret::Timer; - void DrawCaretBK(CFX_Graphics* pGraphics, + void DrawCaretBK(CXFA_Graphics* pGraphics, IFWL_ThemeProvider* pTheme, const CFX_Matrix* pMatrix); diff --git a/xfa/fwl/cfwl_checkbox.cpp b/xfa/fwl/cfwl_checkbox.cpp index 5ec3504cae..eed201ba34 100644 --- a/xfa/fwl/cfwl_checkbox.cpp +++ b/xfa/fwl/cfwl_checkbox.cpp @@ -61,7 +61,7 @@ void CFWL_CheckBox::Update() { Layout(); } -void CFWL_CheckBox::DrawWidget(CFX_Graphics* pGraphics, +void CFWL_CheckBox::DrawWidget(CXFA_Graphics* pGraphics, const CFX_Matrix* pMatrix) { if (!pGraphics) return; @@ -266,7 +266,7 @@ void CFWL_CheckBox::OnProcessMessage(CFWL_Message* pMessage) { CFWL_Widget::OnProcessMessage(pMessage); } -void CFWL_CheckBox::OnDrawWidget(CFX_Graphics* pGraphics, +void CFWL_CheckBox::OnDrawWidget(CXFA_Graphics* pGraphics, const CFX_Matrix* pMatrix) { DrawWidget(pGraphics, pMatrix); } diff --git a/xfa/fwl/cfwl_checkbox.h b/xfa/fwl/cfwl_checkbox.h index 2f434f23cf..6fc9033dee 100644 --- a/xfa/fwl/cfwl_checkbox.h +++ b/xfa/fwl/cfwl_checkbox.h @@ -41,10 +41,10 @@ class CFWL_CheckBox : public CFWL_Widget { // CFWL_Widget FWL_Type GetClassID() const override; void Update() override; - void DrawWidget(CFX_Graphics* pGraphics, const CFX_Matrix* pMatrix) override; + void DrawWidget(CXFA_Graphics* pGraphics, const CFX_Matrix* pMatrix) override; void OnProcessMessage(CFWL_Message* pMessage) override; - void OnDrawWidget(CFX_Graphics* pGraphics, + void OnDrawWidget(CXFA_Graphics* pGraphics, const CFX_Matrix* pMatrix) override; void SetBoxSize(float fHeight); diff --git a/xfa/fwl/cfwl_combobox.cpp b/xfa/fwl/cfwl_combobox.cpp index cdb4f81d67..acc72b0e64 100644 --- a/xfa/fwl/cfwl_combobox.cpp +++ b/xfa/fwl/cfwl_combobox.cpp @@ -125,7 +125,7 @@ FWL_WidgetHit CFWL_ComboBox::HitTest(const CFX_PointF& point) { return CFWL_Widget::HitTest(point); } -void CFWL_ComboBox::DrawWidget(CFX_Graphics* pGraphics, +void CFWL_ComboBox::DrawWidget(CXFA_Graphics* pGraphics, const CFX_Matrix* pMatrix) { if (m_pWidgetMgr->IsFormDisabled()) { DisForm_DrawWidget(pGraphics, pMatrix); @@ -288,7 +288,7 @@ void CFWL_ComboBox::EditModifyStylesEx(uint32_t dwStylesExAdded, m_pEdit->ModifyStylesEx(dwStylesExAdded, dwStylesExRemoved); } -void CFWL_ComboBox::DrawStretchHandler(CFX_Graphics* pGraphics, +void CFWL_ComboBox::DrawStretchHandler(CXFA_Graphics* pGraphics, const CFX_Matrix* pMatrix) { CFWL_ThemeBackground param; param.m_pGraphics = pGraphics; @@ -615,7 +615,7 @@ FWL_WidgetHit CFWL_ComboBox::DisForm_HitTest(const CFX_PointF& point) { return FWL_WidgetHit::Unknown; } -void CFWL_ComboBox::DisForm_DrawWidget(CFX_Graphics* pGraphics, +void CFWL_ComboBox::DisForm_DrawWidget(CXFA_Graphics* pGraphics, const CFX_Matrix* pMatrix) { IFWL_ThemeProvider* pTheme = m_pProperties->m_pThemeProvider; CFX_Matrix mtOrg; @@ -756,7 +756,7 @@ void CFWL_ComboBox::OnProcessEvent(CFWL_Event* pEvent) { } } -void CFWL_ComboBox::OnDrawWidget(CFX_Graphics* pGraphics, +void CFWL_ComboBox::OnDrawWidget(CXFA_Graphics* pGraphics, const CFX_Matrix* pMatrix) { DrawWidget(pGraphics, pMatrix); } diff --git a/xfa/fwl/cfwl_combobox.h b/xfa/fwl/cfwl_combobox.h index 168e203162..396aa6c9d5 100644 --- a/xfa/fwl/cfwl_combobox.h +++ b/xfa/fwl/cfwl_combobox.h @@ -14,7 +14,7 @@ #include "xfa/fwl/cfwl_combolist.h" #include "xfa/fwl/cfwl_form.h" #include "xfa/fwl/cfwl_listbox.h" -#include "xfa/fxgraphics/cfx_graphics.h" +#include "xfa/fxgraphics/cxfa_graphics.h" class CFWL_WidgetProperties; class CFWL_ComboBox; @@ -52,11 +52,11 @@ class CFWL_ComboBox : public CFWL_Widget { void RemoveStates(uint32_t dwStates) override; void Update() override; FWL_WidgetHit HitTest(const CFX_PointF& point) override; - void DrawWidget(CFX_Graphics* pGraphics, const CFX_Matrix* pMatrix) override; + void DrawWidget(CXFA_Graphics* pGraphics, const CFX_Matrix* pMatrix) override; void SetThemeProvider(IFWL_ThemeProvider* pThemeProvider) override; void OnProcessMessage(CFWL_Message* pMessage) override; void OnProcessEvent(CFWL_Event* pEvent) override; - void OnDrawWidget(CFX_Graphics* pGraphics, + void OnDrawWidget(CXFA_Graphics* pGraphics, const CFX_Matrix* pMatrix) override; CFX_WideString GetTextByIndex(int32_t iIndex) const; @@ -95,7 +95,7 @@ class CFWL_ComboBox : public CFWL_Widget { CFX_RectF GetBBox() const; void EditModifyStylesEx(uint32_t dwStylesExAdded, uint32_t dwStylesExRemoved); - void DrawStretchHandler(CFX_Graphics* pGraphics, const CFX_Matrix* pMatrix); + void DrawStretchHandler(CXFA_Graphics* pGraphics, const CFX_Matrix* pMatrix); bool IsDropListVisible() const { return m_pComboBoxProxy && !(m_pComboBoxProxy->GetStates() & FWL_WGTSTATE_Invisible); @@ -136,7 +136,7 @@ class CFWL_ComboBox : public CFWL_Widget { uint32_t dwStylesExRemoved); void DisForm_Update(); FWL_WidgetHit DisForm_HitTest(const CFX_PointF& point); - void DisForm_DrawWidget(CFX_Graphics* pGraphics, const CFX_Matrix* pMatrix); + void DisForm_DrawWidget(CXFA_Graphics* pGraphics, const CFX_Matrix* pMatrix); CFX_RectF DisForm_GetBBox() const; void DisForm_Layout(); void DisForm_OnProcessMessage(CFWL_Message* pMessage); diff --git a/xfa/fwl/cfwl_comboboxproxy.cpp b/xfa/fwl/cfwl_comboboxproxy.cpp index 0e2779b5c9..28c403fb0a 100644 --- a/xfa/fwl/cfwl_comboboxproxy.cpp +++ b/xfa/fwl/cfwl_comboboxproxy.cpp @@ -58,7 +58,7 @@ void CFWL_ComboBoxProxy::OnProcessMessage(CFWL_Message* pMessage) { CFWL_Widget::OnProcessMessage(pMessage); } -void CFWL_ComboBoxProxy::OnDrawWidget(CFX_Graphics* pGraphics, +void CFWL_ComboBoxProxy::OnDrawWidget(CXFA_Graphics* pGraphics, const CFX_Matrix* pMatrix) { m_pComboBox->DrawStretchHandler(pGraphics, pMatrix); } diff --git a/xfa/fwl/cfwl_comboboxproxy.h b/xfa/fwl/cfwl_comboboxproxy.h index 4be14b9e65..8282348657 100644 --- a/xfa/fwl/cfwl_comboboxproxy.h +++ b/xfa/fwl/cfwl_comboboxproxy.h @@ -23,7 +23,7 @@ class CFWL_ComboBoxProxy : public CFWL_FormProxy { // CFWL_FormProxy void OnProcessMessage(CFWL_Message* pMessage) override; - void OnDrawWidget(CFX_Graphics* pGraphics, + void OnDrawWidget(CXFA_Graphics* pGraphics, const CFX_Matrix* pMatrix) override; void Reset() { m_bLButtonUpSelf = false; } diff --git a/xfa/fwl/cfwl_datetimepicker.cpp b/xfa/fwl/cfwl_datetimepicker.cpp index a49785e987..1a82a5c7ee 100644 --- a/xfa/fwl/cfwl_datetimepicker.cpp +++ b/xfa/fwl/cfwl_datetimepicker.cpp @@ -114,7 +114,7 @@ FWL_WidgetHit CFWL_DateTimePicker::HitTest(const CFX_PointF& point) { return FWL_WidgetHit::Unknown; } -void CFWL_DateTimePicker::DrawWidget(CFX_Graphics* pGraphics, +void CFWL_DateTimePicker::DrawWidget(CXFA_Graphics* pGraphics, const CFX_Matrix* pMatrix) { if (!pGraphics) return; @@ -195,7 +195,7 @@ void CFWL_DateTimePicker::ModifyEditStylesEx(uint32_t dwStylesExAdded, m_pEdit->ModifyStylesEx(dwStylesExAdded, dwStylesExRemoved); } -void CFWL_DateTimePicker::DrawDropDownButton(CFX_Graphics* pGraphics, +void CFWL_DateTimePicker::DrawDropDownButton(CXFA_Graphics* pGraphics, IFWL_ThemeProvider* pTheme, const CFX_Matrix* pMatrix) { CFWL_ThemeBackground param; @@ -443,7 +443,7 @@ CFX_RectF CFWL_DateTimePicker::DisForm_GetBBox() const { return rect; } -void CFWL_DateTimePicker::DisForm_DrawWidget(CFX_Graphics* pGraphics, +void CFWL_DateTimePicker::DisForm_DrawWidget(CXFA_Graphics* pGraphics, const CFX_Matrix* pMatrix) { if (!pGraphics) return; @@ -510,7 +510,7 @@ void CFWL_DateTimePicker::OnProcessMessage(CFWL_Message* pMessage) { CFWL_Widget::OnProcessMessage(pMessage); } -void CFWL_DateTimePicker::OnDrawWidget(CFX_Graphics* pGraphics, +void CFWL_DateTimePicker::OnDrawWidget(CXFA_Graphics* pGraphics, const CFX_Matrix* pMatrix) { DrawWidget(pGraphics, pMatrix); } diff --git a/xfa/fwl/cfwl_datetimepicker.h b/xfa/fwl/cfwl_datetimepicker.h index 0f086d6b32..79e9cad9dd 100644 --- a/xfa/fwl/cfwl_datetimepicker.h +++ b/xfa/fwl/cfwl_datetimepicker.h @@ -39,10 +39,10 @@ class CFWL_DateTimePicker : public CFWL_Widget { FWL_Type GetClassID() const override; void Update() override; FWL_WidgetHit HitTest(const CFX_PointF& point) override; - void DrawWidget(CFX_Graphics* pGraphics, const CFX_Matrix* pMatrix) override; + void DrawWidget(CXFA_Graphics* pGraphics, const CFX_Matrix* pMatrix) override; void SetThemeProvider(IFWL_ThemeProvider* pTP) override; void OnProcessMessage(CFWL_Message* pMessage) override; - void OnDrawWidget(CFX_Graphics* pGraphics, + void OnDrawWidget(CXFA_Graphics* pGraphics, const CFX_Matrix* pMatrix) override; void GetCurSel(int32_t& iYear, int32_t& iMonth, int32_t& iDay); @@ -67,7 +67,7 @@ class CFWL_DateTimePicker : public CFWL_Widget { CFWL_FormProxy* GetFormProxy() const { return m_pForm.get(); } private: - void DrawDropDownButton(CFX_Graphics* pGraphics, + void DrawDropDownButton(CXFA_Graphics* pGraphics, IFWL_ThemeProvider* pTheme, const CFX_Matrix* pMatrix); void FormatDateString(int32_t iYear, @@ -88,7 +88,7 @@ class CFWL_DateTimePicker : public CFWL_Widget { bool DisForm_IsNeedShowButton() const; void DisForm_Update(); CFX_RectF DisForm_GetBBox() const; - void DisForm_DrawWidget(CFX_Graphics* pGraphics, const CFX_Matrix* pMatrix); + void DisForm_DrawWidget(CXFA_Graphics* pGraphics, const CFX_Matrix* pMatrix); void DisForm_OnFocusChanged(CFWL_Message* pMsg, bool bSet); CFX_RectF m_rtBtn; diff --git a/xfa/fwl/cfwl_edit.cpp b/xfa/fwl/cfwl_edit.cpp index 268bd1a244..acefd3a964 100644 --- a/xfa/fwl/cfwl_edit.cpp +++ b/xfa/fwl/cfwl_edit.cpp @@ -32,7 +32,7 @@ #include "xfa/fwl/ifwl_themeprovider.h" #include "xfa/fxfa/cxfa_ffdoc.h" #include "xfa/fxfa/cxfa_ffwidget.h" -#include "xfa/fxgraphics/cfx_path.h" +#include "xfa/fxgraphics/cxfa_path.h" namespace { @@ -44,7 +44,7 @@ bool FX_EDIT_ISLATINWORD(wchar_t c) { c == 0x0027; } -void AddSquigglyPath(CFX_Path* pPathData, +void AddSquigglyPath(CXFA_Path* pPathData, float fStartX, float fEndX, float fY, @@ -158,7 +158,7 @@ FWL_WidgetHit CFWL_Edit::HitTest(const CFX_PointF& point) { return FWL_WidgetHit::Unknown; } -void CFWL_Edit::AddSpellCheckObj(CFX_Path& PathData, +void CFWL_Edit::AddSpellCheckObj(CXFA_Path& PathData, int32_t nStart, int32_t nCount, float fOffSetX, @@ -184,7 +184,7 @@ void CFWL_Edit::AddSpellCheckObj(CFX_Path& PathData, } } -void CFWL_Edit::DrawSpellCheck(CFX_Graphics* pGraphics, +void CFWL_Edit::DrawSpellCheck(CXFA_Graphics* pGraphics, const CFX_Matrix* pMatrix) { pGraphics->SaveGraphState(); if (pMatrix) @@ -193,7 +193,7 @@ void CFWL_Edit::DrawSpellCheck(CFX_Graphics* pGraphics, CXFA_Color crLine(0xFFFF0000); CFWL_EventCheckWord checkWordEvent(this); CFX_ByteString sLatinWord; - CFX_Path pathSpell; + CXFA_Path pathSpell; int32_t nStart = 0; float fOffSetX = m_rtEngine.left - m_fScrollOffsetX; float fOffSetY = m_rtEngine.top - m_fScrollOffsetY + m_fVAlignOffset; @@ -240,7 +240,8 @@ void CFWL_Edit::DrawSpellCheck(CFX_Graphics* pGraphics, pGraphics->RestoreGraphState(); } -void CFWL_Edit::DrawWidget(CFX_Graphics* pGraphics, const CFX_Matrix* pMatrix) { +void CFWL_Edit::DrawWidget(CXFA_Graphics* pGraphics, + const CFX_Matrix* pMatrix) { if (!pGraphics) return; if (!m_pProperties->m_pThemeProvider) @@ -472,7 +473,7 @@ void CFWL_Edit::SetScrollOffset(float fScrollOffset) { m_fScrollOffsetY = fScrollOffset; } -void CFWL_Edit::DrawTextBk(CFX_Graphics* pGraphics, +void CFWL_Edit::DrawTextBk(CXFA_Graphics* pGraphics, IFWL_ThemeProvider* pTheme, const CFX_Matrix* pMatrix) { CFWL_ThemeBackground param; @@ -504,7 +505,7 @@ void CFWL_Edit::DrawTextBk(CFX_Graphics* pGraphics, pTheme->DrawBackground(¶m); } -void CFWL_Edit::DrawContent(CFX_Graphics* pGraphics, +void CFWL_Edit::DrawContent(CXFA_Graphics* pGraphics, IFWL_ThemeProvider* pTheme, const CFX_Matrix* pMatrix) { CFDE_TxtEdtPage* pPage = m_EdtEngine.GetPage(0); @@ -545,7 +546,7 @@ void CFWL_Edit::DrawContent(CFX_Graphics* pGraphics, &rectArr); } - CFX_Path path; + CXFA_Path path; for (auto& rect : rectArr) { rect.left += fOffSetX; rect.top += fOffSetY; @@ -575,7 +576,7 @@ void CFWL_Edit::DrawContent(CFX_Graphics* pGraphics, if (m_pProperties->m_dwStyleExes & FWL_STYLEEXT_EDT_CombText) { pGraphics->RestoreGraphState(); - CFX_Path path; + CXFA_Path path; int32_t iLimit = m_nLimit > 0 ? m_nLimit : 1; float fStep = m_rtEngine.width / iLimit; float fLeft = m_rtEngine.left + 1; @@ -1235,7 +1236,7 @@ void CFWL_Edit::OnProcessEvent(CFWL_Event* pEvent) { } } -void CFWL_Edit::OnDrawWidget(CFX_Graphics* pGraphics, +void CFWL_Edit::OnDrawWidget(CXFA_Graphics* pGraphics, const CFX_Matrix* pMatrix) { DrawWidget(pGraphics, pMatrix); } diff --git a/xfa/fwl/cfwl_edit.h b/xfa/fwl/cfwl_edit.h index 0dbbcd6eef..15d20bf7cb 100644 --- a/xfa/fwl/cfwl_edit.h +++ b/xfa/fwl/cfwl_edit.h @@ -16,7 +16,7 @@ #include "xfa/fwl/cfwl_event.h" #include "xfa/fwl/cfwl_scrollbar.h" #include "xfa/fwl/cfwl_widget.h" -#include "xfa/fxgraphics/cfx_path.h" +#include "xfa/fxgraphics/cxfa_path.h" #define FWL_STYLEEXT_EDT_ReadOnly (1L << 0) #define FWL_STYLEEXT_EDT_MultiLine (1L << 1) @@ -61,11 +61,11 @@ class CFWL_Edit : public CFWL_Widget { void Update() override; FWL_WidgetHit HitTest(const CFX_PointF& point) override; void SetStates(uint32_t dwStates) override; - void DrawWidget(CFX_Graphics* pGraphics, const CFX_Matrix* pMatrix) override; + void DrawWidget(CXFA_Graphics* pGraphics, const CFX_Matrix* pMatrix) override; void SetThemeProvider(IFWL_ThemeProvider* pThemeProvider) override; void OnProcessMessage(CFWL_Message* pMessage) override; void OnProcessEvent(CFWL_Event* pEvent) override; - void OnDrawWidget(CFX_Graphics* pGraphics, + void OnDrawWidget(CXFA_Graphics* pGraphics, const CFX_Matrix* pMatrix) override; virtual void SetText(const CFX_WideString& wsText); @@ -109,13 +109,13 @@ class CFWL_Edit : public CFWL_Widget { CFDE_TxtEdtEngine* GetTxtEdtEngine() { return &m_EdtEngine; } private: - void DrawTextBk(CFX_Graphics* pGraphics, + void DrawTextBk(CXFA_Graphics* pGraphics, IFWL_ThemeProvider* pTheme, const CFX_Matrix* pMatrix); - void DrawContent(CFX_Graphics* pGraphics, + void DrawContent(CXFA_Graphics* pGraphics, IFWL_ThemeProvider* pTheme, const CFX_Matrix* pMatrix); - void DrawSpellCheck(CFX_Graphics* pGraphics, const CFX_Matrix* pMatrix); + void DrawSpellCheck(CXFA_Graphics* pGraphics, const CFX_Matrix* pMatrix); void UpdateEditEngine(); void UpdateEditParams(); @@ -138,7 +138,7 @@ class CFWL_Edit : public CFWL_Widget { bool IsContentHeightOverflow(); int32_t AddDoRecord(std::unique_ptr<IFDE_TxtEdtDoRecord> pRecord); void ProcessInsertError(int32_t iError); - void AddSpellCheckObj(CFX_Path& PathData, + void AddSpellCheckObj(CXFA_Path& PathData, int32_t nStart, int32_t nCount, float fOffSetX, diff --git a/xfa/fwl/cfwl_event.h b/xfa/fwl/cfwl_event.h index e326ab32c8..01e3914b8b 100644 --- a/xfa/fwl/cfwl_event.h +++ b/xfa/fwl/cfwl_event.h @@ -13,7 +13,7 @@ #include "xfa/fwl/cfwl_messagekey.h" #include "xfa/fwl/cfwl_messagemouse.h" -class CFX_Graphics; +class CXFA_Graphics; class CFWL_Widget; class CFWL_Event { diff --git a/xfa/fwl/cfwl_form.cpp b/xfa/fwl/cfwl_form.cpp index 3e606b3eb9..c560a0d352 100644 --- a/xfa/fwl/cfwl_form.cpp +++ b/xfa/fwl/cfwl_form.cpp @@ -75,7 +75,8 @@ FWL_WidgetHit CFWL_Form::HitTest(const CFX_PointF& point) { : FWL_WidgetHit::Client; } -void CFWL_Form::DrawWidget(CFX_Graphics* pGraphics, const CFX_Matrix* pMatrix) { +void CFWL_Form::DrawWidget(CXFA_Graphics* pGraphics, + const CFX_Matrix* pMatrix) { if (!pGraphics) return; if (!m_pProperties->m_pThemeProvider) @@ -147,7 +148,7 @@ void CFWL_Form::EndDoModal() { #endif } -void CFWL_Form::DrawBackground(CFX_Graphics* pGraphics, +void CFWL_Form::DrawBackground(CXFA_Graphics* pGraphics, IFWL_ThemeProvider* pTheme) { CFWL_ThemeBackground param; param.m_pWidget = this; @@ -238,7 +239,7 @@ void CFWL_Form::OnProcessMessage(CFWL_Message* pMessage) { #endif // FWL_UseMacSystemBorder } -void CFWL_Form::OnDrawWidget(CFX_Graphics* pGraphics, +void CFWL_Form::OnDrawWidget(CXFA_Graphics* pGraphics, const CFX_Matrix* pMatrix) { DrawWidget(pGraphics, pMatrix); } diff --git a/xfa/fwl/cfwl_form.h b/xfa/fwl/cfwl_form.h index ec7fc137be..96452e8e33 100644 --- a/xfa/fwl/cfwl_form.h +++ b/xfa/fwl/cfwl_form.h @@ -38,9 +38,9 @@ class CFWL_Form : public CFWL_Widget { CFX_RectF GetClientRect() override; void Update() override; FWL_WidgetHit HitTest(const CFX_PointF& point) override; - void DrawWidget(CFX_Graphics* pGraphics, const CFX_Matrix* pMatrix) override; + void DrawWidget(CXFA_Graphics* pGraphics, const CFX_Matrix* pMatrix) override; void OnProcessMessage(CFWL_Message* pMessage) override; - void OnDrawWidget(CFX_Graphics* pGraphics, + void OnDrawWidget(CXFA_Graphics* pGraphics, const CFX_Matrix* pMatrix) override; CFWL_Widget* DoModal(); @@ -50,7 +50,7 @@ class CFWL_Form : public CFWL_Widget { void SetSubFocus(CFWL_Widget* pWidget) { m_pSubFocus = pWidget; } private: - void DrawBackground(CFX_Graphics* pGraphics, IFWL_ThemeProvider* pTheme); + void DrawBackground(CXFA_Graphics* pGraphics, IFWL_ThemeProvider* pTheme); CFX_RectF GetEdgeRect(); void SetWorkAreaRect(); void Layout(); diff --git a/xfa/fwl/cfwl_formproxy.cpp b/xfa/fwl/cfwl_formproxy.cpp index 776ba0ac61..af7703e9c0 100644 --- a/xfa/fwl/cfwl_formproxy.cpp +++ b/xfa/fwl/cfwl_formproxy.cpp @@ -32,7 +32,7 @@ bool CFWL_FormProxy::IsInstance(const CFX_WideStringC& wsClass) const { void CFWL_FormProxy::Update() {} -void CFWL_FormProxy::DrawWidget(CFX_Graphics* pGraphics, +void CFWL_FormProxy::DrawWidget(CXFA_Graphics* pGraphics, const CFX_Matrix* pMatrix) {} void CFWL_FormProxy::OnProcessMessage(CFWL_Message* pMessage) { diff --git a/xfa/fwl/cfwl_formproxy.h b/xfa/fwl/cfwl_formproxy.h index 4ad70bf15c..dbc49d8f5e 100644 --- a/xfa/fwl/cfwl_formproxy.h +++ b/xfa/fwl/cfwl_formproxy.h @@ -24,7 +24,7 @@ class CFWL_FormProxy : public CFWL_Form { FWL_Type GetClassID() const override; bool IsInstance(const CFX_WideStringC& wsClass) const override; void Update() override; - void DrawWidget(CFX_Graphics* pGraphics, const CFX_Matrix* pMatrix) override; + void DrawWidget(CXFA_Graphics* pGraphics, const CFX_Matrix* pMatrix) override; void OnProcessMessage(CFWL_Message* pMessage) override; }; diff --git a/xfa/fwl/cfwl_listbox.cpp b/xfa/fwl/cfwl_listbox.cpp index 0fd43efa08..ddad4038f5 100644 --- a/xfa/fwl/cfwl_listbox.cpp +++ b/xfa/fwl/cfwl_listbox.cpp @@ -91,7 +91,7 @@ FWL_WidgetHit CFWL_ListBox::HitTest(const CFX_PointF& point) { return FWL_WidgetHit::Unknown; } -void CFWL_ListBox::DrawWidget(CFX_Graphics* pGraphics, +void CFWL_ListBox::DrawWidget(CXFA_Graphics* pGraphics, const CFX_Matrix* pMatrix) { if (!pGraphics) return; @@ -352,7 +352,7 @@ bool CFWL_ListBox::ScrollToVisible(CFWL_ListItem* pItem) { return true; } -void CFWL_ListBox::DrawBkground(CFX_Graphics* pGraphics, +void CFWL_ListBox::DrawBkground(CXFA_Graphics* pGraphics, IFWL_ThemeProvider* pTheme, const CFX_Matrix* pMatrix) { if (!pGraphics) @@ -375,7 +375,7 @@ void CFWL_ListBox::DrawBkground(CFX_Graphics* pGraphics, pTheme->DrawBackground(¶m); } -void CFWL_ListBox::DrawItems(CFX_Graphics* pGraphics, +void CFWL_ListBox::DrawItems(CXFA_Graphics* pGraphics, IFWL_ThemeProvider* pTheme, const CFX_Matrix* pMatrix) { float fPosX = 0.0f; @@ -408,7 +408,7 @@ void CFWL_ListBox::DrawItems(CFX_Graphics* pGraphics, } } -void CFWL_ListBox::DrawItem(CFX_Graphics* pGraphics, +void CFWL_ListBox::DrawItem(CXFA_Graphics* pGraphics, IFWL_ThemeProvider* pTheme, CFWL_ListItem* pItem, int32_t Index, @@ -714,7 +714,7 @@ void CFWL_ListBox::OnProcessEvent(CFWL_Event* pEvent) { } } -void CFWL_ListBox::OnDrawWidget(CFX_Graphics* pGraphics, +void CFWL_ListBox::OnDrawWidget(CXFA_Graphics* pGraphics, const CFX_Matrix* pMatrix) { DrawWidget(pGraphics, pMatrix); } diff --git a/xfa/fwl/cfwl_listbox.h b/xfa/fwl/cfwl_listbox.h index 18aaf4cbd5..4f934432d6 100644 --- a/xfa/fwl/cfwl_listbox.h +++ b/xfa/fwl/cfwl_listbox.h @@ -42,11 +42,11 @@ class CFWL_ListBox : public CFWL_Widget { FWL_Type GetClassID() const override; void Update() override; FWL_WidgetHit HitTest(const CFX_PointF& point) override; - void DrawWidget(CFX_Graphics* pGraphics, const CFX_Matrix* pMatrix) override; + void DrawWidget(CXFA_Graphics* pGraphics, const CFX_Matrix* pMatrix) override; void SetThemeProvider(IFWL_ThemeProvider* pThemeProvider) override; void OnProcessMessage(CFWL_Message* pMessage) override; void OnProcessEvent(CFWL_Event* pEvent) override; - void OnDrawWidget(CFX_Graphics* pGraphics, + void OnDrawWidget(CXFA_Graphics* pGraphics, const CFX_Matrix* pMatrix) override; int32_t CountItems(const CFWL_Widget* pWidget) const; @@ -85,19 +85,19 @@ class CFWL_ListBox : public CFWL_Widget { void SelectAll(); CFWL_ListItem* GetFocusedItem(); void SetFocusItem(CFWL_ListItem* hItem); - void DrawBkground(CFX_Graphics* pGraphics, + void DrawBkground(CXFA_Graphics* pGraphics, IFWL_ThemeProvider* pTheme, const CFX_Matrix* pMatrix); - void DrawItems(CFX_Graphics* pGraphics, + void DrawItems(CXFA_Graphics* pGraphics, IFWL_ThemeProvider* pTheme, const CFX_Matrix* pMatrix); - void DrawItem(CFX_Graphics* pGraphics, + void DrawItem(CXFA_Graphics* pGraphics, IFWL_ThemeProvider* pTheme, CFWL_ListItem* hItem, int32_t Index, const CFX_RectF& rtItem, const CFX_Matrix* pMatrix); - void DrawStatic(CFX_Graphics* pGraphics, IFWL_ThemeProvider* pTheme); + void DrawStatic(CXFA_Graphics* pGraphics, IFWL_ThemeProvider* pTheme); CFX_SizeF CalcSize(bool bAutoSize); void UpdateItemSize(CFWL_ListItem* hItem, CFX_SizeF& size, diff --git a/xfa/fwl/cfwl_monthcalendar.cpp b/xfa/fwl/cfwl_monthcalendar.cpp index 4ef0c694c5..8c770e545b 100644 --- a/xfa/fwl/cfwl_monthcalendar.cpp +++ b/xfa/fwl/cfwl_monthcalendar.cpp @@ -146,7 +146,7 @@ void CFWL_MonthCalendar::Update() { Layout(); } -void CFWL_MonthCalendar::DrawWidget(CFX_Graphics* pGraphics, +void CFWL_MonthCalendar::DrawWidget(CXFA_Graphics* pGraphics, const CFX_Matrix* pMatrix) { if (!pGraphics) return; @@ -178,7 +178,7 @@ void CFWL_MonthCalendar::SetSelect(int32_t iYear, AddSelDay(iDay); } -void CFWL_MonthCalendar::DrawBackground(CFX_Graphics* pGraphics, +void CFWL_MonthCalendar::DrawBackground(CXFA_Graphics* pGraphics, IFWL_ThemeProvider* pTheme, const CFX_Matrix* pMatrix) { CFWL_ThemeBackground params; @@ -192,7 +192,7 @@ void CFWL_MonthCalendar::DrawBackground(CFX_Graphics* pGraphics, pTheme->DrawBackground(¶ms); } -void CFWL_MonthCalendar::DrawHeadBK(CFX_Graphics* pGraphics, +void CFWL_MonthCalendar::DrawHeadBK(CXFA_Graphics* pGraphics, IFWL_ThemeProvider* pTheme, const CFX_Matrix* pMatrix) { CFWL_ThemeBackground params; @@ -206,7 +206,7 @@ void CFWL_MonthCalendar::DrawHeadBK(CFX_Graphics* pGraphics, pTheme->DrawBackground(¶ms); } -void CFWL_MonthCalendar::DrawLButton(CFX_Graphics* pGraphics, +void CFWL_MonthCalendar::DrawLButton(CXFA_Graphics* pGraphics, IFWL_ThemeProvider* pTheme, const CFX_Matrix* pMatrix) { CFWL_ThemeBackground params; @@ -220,7 +220,7 @@ void CFWL_MonthCalendar::DrawLButton(CFX_Graphics* pGraphics, pTheme->DrawBackground(¶ms); } -void CFWL_MonthCalendar::DrawRButton(CFX_Graphics* pGraphics, +void CFWL_MonthCalendar::DrawRButton(CXFA_Graphics* pGraphics, IFWL_ThemeProvider* pTheme, const CFX_Matrix* pMatrix) { CFWL_ThemeBackground params; @@ -234,7 +234,7 @@ void CFWL_MonthCalendar::DrawRButton(CFX_Graphics* pGraphics, pTheme->DrawBackground(¶ms); } -void CFWL_MonthCalendar::DrawCaption(CFX_Graphics* pGraphics, +void CFWL_MonthCalendar::DrawCaption(CXFA_Graphics* pGraphics, IFWL_ThemeProvider* pTheme, const CFX_Matrix* pMatrix) { CFWL_ThemeText textParam; @@ -254,7 +254,7 @@ void CFWL_MonthCalendar::DrawCaption(CFX_Graphics* pGraphics, pTheme->DrawText(&textParam); } -void CFWL_MonthCalendar::DrawSeperator(CFX_Graphics* pGraphics, +void CFWL_MonthCalendar::DrawSeperator(CXFA_Graphics* pGraphics, IFWL_ThemeProvider* pTheme, const CFX_Matrix* pMatrix) { CFWL_ThemeBackground params; @@ -268,7 +268,7 @@ void CFWL_MonthCalendar::DrawSeperator(CFX_Graphics* pGraphics, pTheme->DrawBackground(¶ms); } -void CFWL_MonthCalendar::DrawDatesInBK(CFX_Graphics* pGraphics, +void CFWL_MonthCalendar::DrawDatesInBK(CXFA_Graphics* pGraphics, IFWL_ThemeProvider* pTheme, const CFX_Matrix* pMatrix) { CFWL_ThemeBackground params; @@ -298,7 +298,7 @@ void CFWL_MonthCalendar::DrawDatesInBK(CFX_Graphics* pGraphics, } } -void CFWL_MonthCalendar::DrawWeek(CFX_Graphics* pGraphics, +void CFWL_MonthCalendar::DrawWeek(CXFA_Graphics* pGraphics, IFWL_ThemeProvider* pTheme, const CFX_Matrix* pMatrix) { CFWL_ThemeText params; @@ -323,7 +323,7 @@ void CFWL_MonthCalendar::DrawWeek(CFX_Graphics* pGraphics, } } -void CFWL_MonthCalendar::DrawToday(CFX_Graphics* pGraphics, +void CFWL_MonthCalendar::DrawToday(CXFA_Graphics* pGraphics, IFWL_ThemeProvider* pTheme, const CFX_Matrix* pMatrix) { CFWL_ThemeText params; @@ -344,7 +344,7 @@ void CFWL_MonthCalendar::DrawToday(CFX_Graphics* pGraphics, pTheme->DrawText(¶ms); } -void CFWL_MonthCalendar::DrawDatesIn(CFX_Graphics* pGraphics, +void CFWL_MonthCalendar::DrawDatesIn(CXFA_Graphics* pGraphics, IFWL_ThemeProvider* pTheme, const CFX_Matrix* pMatrix) { CFWL_ThemeText params; @@ -369,7 +369,7 @@ void CFWL_MonthCalendar::DrawDatesIn(CFX_Graphics* pGraphics, } } -void CFWL_MonthCalendar::DrawDatesOut(CFX_Graphics* pGraphics, +void CFWL_MonthCalendar::DrawDatesOut(CXFA_Graphics* pGraphics, IFWL_ThemeProvider* pTheme, const CFX_Matrix* pMatrix) { CFWL_ThemeText params; @@ -383,7 +383,7 @@ void CFWL_MonthCalendar::DrawDatesOut(CFX_Graphics* pGraphics, pTheme->DrawText(¶ms); } -void CFWL_MonthCalendar::DrawDatesInCircle(CFX_Graphics* pGraphics, +void CFWL_MonthCalendar::DrawDatesInCircle(CXFA_Graphics* pGraphics, IFWL_ThemeProvider* pTheme, const CFX_Matrix* pMatrix) { if (m_iMonth != m_iCurMonth || m_iYear != m_iCurYear) @@ -745,7 +745,7 @@ void CFWL_MonthCalendar::OnProcessMessage(CFWL_Message* pMessage) { CFWL_Widget::OnProcessMessage(pMessage); } -void CFWL_MonthCalendar::OnDrawWidget(CFX_Graphics* pGraphics, +void CFWL_MonthCalendar::OnDrawWidget(CXFA_Graphics* pGraphics, const CFX_Matrix* pMatrix) { DrawWidget(pGraphics, pMatrix); } diff --git a/xfa/fwl/cfwl_monthcalendar.h b/xfa/fwl/cfwl_monthcalendar.h index 70c0401b7d..e537c331ef 100644 --- a/xfa/fwl/cfwl_monthcalendar.h +++ b/xfa/fwl/cfwl_monthcalendar.h @@ -33,9 +33,9 @@ class CFWL_MonthCalendar : public CFWL_Widget { FWL_Type GetClassID() const override; CFX_RectF GetAutosizedWidgetRect() override; void Update() override; - void DrawWidget(CFX_Graphics* pGraphics, const CFX_Matrix* pMatrix) override; + void DrawWidget(CXFA_Graphics* pGraphics, const CFX_Matrix* pMatrix) override; void OnProcessMessage(CFWL_Message* pMessage) override; - void OnDrawWidget(CFX_Graphics* pGraphics, + void OnDrawWidget(CXFA_Graphics* pGraphics, const CFX_Matrix* pMatrix) override; void SetSelect(int32_t iYear, int32_t iMonth, int32_t iDay); @@ -90,40 +90,40 @@ class CFWL_MonthCalendar : public CFWL_Widget { CFX_WideString wsDay; }; - void DrawBackground(CFX_Graphics* pGraphics, + void DrawBackground(CXFA_Graphics* pGraphics, IFWL_ThemeProvider* pTheme, const CFX_Matrix* pMatrix); - void DrawHeadBK(CFX_Graphics* pGraphics, + void DrawHeadBK(CXFA_Graphics* pGraphics, IFWL_ThemeProvider* pTheme, const CFX_Matrix* pMatrix); - void DrawLButton(CFX_Graphics* pGraphics, + void DrawLButton(CXFA_Graphics* pGraphics, IFWL_ThemeProvider* pTheme, const CFX_Matrix* pMatrix); - void DrawRButton(CFX_Graphics* pGraphics, + void DrawRButton(CXFA_Graphics* pGraphics, IFWL_ThemeProvider* pTheme, const CFX_Matrix* pMatrix); - void DrawCaption(CFX_Graphics* pGraphics, + void DrawCaption(CXFA_Graphics* pGraphics, IFWL_ThemeProvider* pTheme, const CFX_Matrix* pMatrix); - void DrawSeperator(CFX_Graphics* pGraphics, + void DrawSeperator(CXFA_Graphics* pGraphics, IFWL_ThemeProvider* pTheme, const CFX_Matrix* pMatrix); - void DrawDatesInBK(CFX_Graphics* pGraphics, + void DrawDatesInBK(CXFA_Graphics* pGraphics, IFWL_ThemeProvider* pTheme, const CFX_Matrix* pMatrix); - void DrawWeek(CFX_Graphics* pGraphics, + void DrawWeek(CXFA_Graphics* pGraphics, IFWL_ThemeProvider* pTheme, const CFX_Matrix* pMatrix); - void DrawToday(CFX_Graphics* pGraphics, + void DrawToday(CXFA_Graphics* pGraphics, IFWL_ThemeProvider* pTheme, const CFX_Matrix* pMatrix); - void DrawDatesIn(CFX_Graphics* pGraphics, + void DrawDatesIn(CXFA_Graphics* pGraphics, IFWL_ThemeProvider* pTheme, const CFX_Matrix* pMatrix); - void DrawDatesOut(CFX_Graphics* pGraphics, + void DrawDatesOut(CXFA_Graphics* pGraphics, IFWL_ThemeProvider* pTheme, const CFX_Matrix* pMatrix); - void DrawDatesInCircle(CFX_Graphics* pGraphics, + void DrawDatesInCircle(CXFA_Graphics* pGraphics, IFWL_ThemeProvider* pTheme, const CFX_Matrix* pMatrix); CFX_SizeF CalcSize(); diff --git a/xfa/fwl/cfwl_notedriver.h b/xfa/fwl/cfwl_notedriver.h index b55e701c40..0db482ecbc 100644 --- a/xfa/fwl/cfwl_notedriver.h +++ b/xfa/fwl/cfwl_notedriver.h @@ -14,7 +14,7 @@ #include "xfa/fwl/cfwl_event.h" #include "xfa/fwl/cfwl_widget.h" -#include "xfa/fxgraphics/cfx_graphics.h" +#include "xfa/fxgraphics/cxfa_graphics.h" class CFWL_EventTarget; class CFWL_NoteLoop; diff --git a/xfa/fwl/cfwl_picturebox.cpp b/xfa/fwl/cfwl_picturebox.cpp index 8c200e0494..096b14ec61 100644 --- a/xfa/fwl/cfwl_picturebox.cpp +++ b/xfa/fwl/cfwl_picturebox.cpp @@ -32,7 +32,7 @@ void CFWL_PictureBox::Update() { m_rtClient = GetClientRect(); } -void CFWL_PictureBox::DrawWidget(CFX_Graphics* pGraphics, +void CFWL_PictureBox::DrawWidget(CXFA_Graphics* pGraphics, const CFX_Matrix* pMatrix) { if (!pGraphics) return; @@ -44,7 +44,7 @@ void CFWL_PictureBox::DrawWidget(CFX_Graphics* pGraphics, DrawBorder(pGraphics, CFWL_Part::Border, pTheme, pMatrix); } -void CFWL_PictureBox::OnDrawWidget(CFX_Graphics* pGraphics, +void CFWL_PictureBox::OnDrawWidget(CXFA_Graphics* pGraphics, const CFX_Matrix* pMatrix) { DrawWidget(pGraphics, pMatrix); } diff --git a/xfa/fwl/cfwl_picturebox.h b/xfa/fwl/cfwl_picturebox.h index 743ea1dc6d..e244c853b8 100644 --- a/xfa/fwl/cfwl_picturebox.h +++ b/xfa/fwl/cfwl_picturebox.h @@ -23,8 +23,8 @@ class CFWL_PictureBox : public CFWL_Widget { // CFWL_Widget FWL_Type GetClassID() const override; void Update() override; - void DrawWidget(CFX_Graphics* pGraphics, const CFX_Matrix* pMatrix) override; - void OnDrawWidget(CFX_Graphics* pGraphics, + void DrawWidget(CXFA_Graphics* pGraphics, const CFX_Matrix* pMatrix) override; + void OnDrawWidget(CXFA_Graphics* pGraphics, const CFX_Matrix* pMatrix) override; private: diff --git a/xfa/fwl/cfwl_pushbutton.cpp b/xfa/fwl/cfwl_pushbutton.cpp index 42925414f8..382748df53 100644 --- a/xfa/fwl/cfwl_pushbutton.cpp +++ b/xfa/fwl/cfwl_pushbutton.cpp @@ -51,7 +51,7 @@ void CFWL_PushButton::Update() { m_rtCaption = m_rtClient; } -void CFWL_PushButton::DrawWidget(CFX_Graphics* pGraphics, +void CFWL_PushButton::DrawWidget(CXFA_Graphics* pGraphics, const CFX_Matrix* pMatrix) { if (!pGraphics) return; @@ -65,7 +65,7 @@ void CFWL_PushButton::DrawWidget(CFX_Graphics* pGraphics, DrawBkground(pGraphics, m_pProperties->m_pThemeProvider, pMatrix); } -void CFWL_PushButton::DrawBkground(CFX_Graphics* pGraphics, +void CFWL_PushButton::DrawBkground(CXFA_Graphics* pGraphics, IFWL_ThemeProvider* pTheme, const CFX_Matrix* pMatrix) { CFWL_ThemeBackground param; @@ -144,7 +144,7 @@ void CFWL_PushButton::OnProcessMessage(CFWL_Message* pMessage) { CFWL_Widget::OnProcessMessage(pMessage); } -void CFWL_PushButton::OnDrawWidget(CFX_Graphics* pGraphics, +void CFWL_PushButton::OnDrawWidget(CXFA_Graphics* pGraphics, const CFX_Matrix* pMatrix) { DrawWidget(pGraphics, pMatrix); } diff --git a/xfa/fwl/cfwl_pushbutton.h b/xfa/fwl/cfwl_pushbutton.h index f7323eb46b..196c53763f 100644 --- a/xfa/fwl/cfwl_pushbutton.h +++ b/xfa/fwl/cfwl_pushbutton.h @@ -28,13 +28,13 @@ class CFWL_PushButton : public CFWL_Widget { FWL_Type GetClassID() const override; void SetStates(uint32_t dwStates) override; void Update() override; - void DrawWidget(CFX_Graphics* pGraphics, const CFX_Matrix* pMatrix) override; + void DrawWidget(CXFA_Graphics* pGraphics, const CFX_Matrix* pMatrix) override; void OnProcessMessage(CFWL_Message* pMessage) override; - void OnDrawWidget(CFX_Graphics* pGraphics, + void OnDrawWidget(CXFA_Graphics* pGraphics, const CFX_Matrix* pMatrix) override; private: - void DrawBkground(CFX_Graphics* pGraphics, + void DrawBkground(CXFA_Graphics* pGraphics, IFWL_ThemeProvider* pTheme, const CFX_Matrix* pMatrix); uint32_t GetPartStates(); diff --git a/xfa/fwl/cfwl_scrollbar.cpp b/xfa/fwl/cfwl_scrollbar.cpp index 79e8b48115..0e1a9be1ba 100644 --- a/xfa/fwl/cfwl_scrollbar.cpp +++ b/xfa/fwl/cfwl_scrollbar.cpp @@ -74,7 +74,7 @@ void CFWL_ScrollBar::Update() { Layout(); } -void CFWL_ScrollBar::DrawWidget(CFX_Graphics* pGraphics, +void CFWL_ScrollBar::DrawWidget(CXFA_Graphics* pGraphics, const CFX_Matrix* pMatrix) { if (!pGraphics) return; @@ -104,7 +104,7 @@ bool CFWL_ScrollBar::DoScroll(CFWL_EventScroll::Code dwCode, float fPos) { return OnScroll(dwCode, fPos); } -void CFWL_ScrollBar::DrawTrack(CFX_Graphics* pGraphics, +void CFWL_ScrollBar::DrawTrack(CXFA_Graphics* pGraphics, IFWL_ThemeProvider* pTheme, bool bLower, const CFX_Matrix* pMatrix) { @@ -120,7 +120,7 @@ void CFWL_ScrollBar::DrawTrack(CFX_Graphics* pGraphics, pTheme->DrawBackground(¶m); } -void CFWL_ScrollBar::DrawArrowBtn(CFX_Graphics* pGraphics, +void CFWL_ScrollBar::DrawArrowBtn(CXFA_Graphics* pGraphics, IFWL_ThemeProvider* pTheme, bool bMinBtn, const CFX_Matrix* pMatrix) { @@ -137,7 +137,7 @@ void CFWL_ScrollBar::DrawArrowBtn(CFX_Graphics* pGraphics, pTheme->DrawBackground(¶m); } -void CFWL_ScrollBar::DrawThumb(CFX_Graphics* pGraphics, +void CFWL_ScrollBar::DrawThumb(CXFA_Graphics* pGraphics, IFWL_ThemeProvider* pTheme, const CFX_Matrix* pMatrix) { CFWL_ThemeBackground param; @@ -355,7 +355,7 @@ void CFWL_ScrollBar::OnProcessMessage(CFWL_Message* pMessage) { } } -void CFWL_ScrollBar::OnDrawWidget(CFX_Graphics* pGraphics, +void CFWL_ScrollBar::OnDrawWidget(CXFA_Graphics* pGraphics, const CFX_Matrix* pMatrix) { DrawWidget(pGraphics, pMatrix); } diff --git a/xfa/fwl/cfwl_scrollbar.h b/xfa/fwl/cfwl_scrollbar.h index 262d0794d8..368dee96fe 100644 --- a/xfa/fwl/cfwl_scrollbar.h +++ b/xfa/fwl/cfwl_scrollbar.h @@ -30,9 +30,9 @@ class CFWL_ScrollBar : public CFWL_Widget { // CFWL_Widget FWL_Type GetClassID() const override; void Update() override; - void DrawWidget(CFX_Graphics* pGraphics, const CFX_Matrix* pMatrix) override; + void DrawWidget(CXFA_Graphics* pGraphics, const CFX_Matrix* pMatrix) override; void OnProcessMessage(CFWL_Message* pMessage) override; - void OnDrawWidget(CFX_Graphics* pGraphics, + void OnDrawWidget(CXFA_Graphics* pGraphics, const CFX_Matrix* pMatrix) override; void GetRange(float* fMin, float* fMax) const { @@ -66,15 +66,15 @@ class CFWL_ScrollBar : public CFWL_Widget { bool IsVertical() const { return !!(m_pProperties->m_dwStyleExes & FWL_STYLEEXT_SCB_Vert); } - void DrawTrack(CFX_Graphics* pGraphics, + void DrawTrack(CXFA_Graphics* pGraphics, IFWL_ThemeProvider* pTheme, bool bLower, const CFX_Matrix* pMatrix); - void DrawArrowBtn(CFX_Graphics* pGraphics, + void DrawArrowBtn(CXFA_Graphics* pGraphics, IFWL_ThemeProvider* pTheme, bool bMinBtn, const CFX_Matrix* pMatrix); - void DrawThumb(CFX_Graphics* pGraphics, + void DrawThumb(CXFA_Graphics* pGraphics, IFWL_ThemeProvider* pTheme, const CFX_Matrix* pMatrix); void Layout(); diff --git a/xfa/fwl/cfwl_spinbutton.cpp b/xfa/fwl/cfwl_spinbutton.cpp index 65bd6cdd3a..2943c205d7 100644 --- a/xfa/fwl/cfwl_spinbutton.cpp +++ b/xfa/fwl/cfwl_spinbutton.cpp @@ -78,7 +78,7 @@ FWL_WidgetHit CFWL_SpinButton::HitTest(const CFX_PointF& point) { return FWL_WidgetHit::Unknown; } -void CFWL_SpinButton::DrawWidget(CFX_Graphics* pGraphics, +void CFWL_SpinButton::DrawWidget(CXFA_Graphics* pGraphics, const CFX_Matrix* pMatrix) { if (!pGraphics) return; @@ -107,7 +107,7 @@ bool CFWL_SpinButton::IsDownButtonEnabled() { return m_dwDnState != CFWL_PartState_Disabled; } -void CFWL_SpinButton::DrawUpButton(CFX_Graphics* pGraphics, +void CFWL_SpinButton::DrawUpButton(CXFA_Graphics* pGraphics, IFWL_ThemeProvider* pTheme, const CFX_Matrix* pMatrix) { CFWL_ThemeBackground params; @@ -122,7 +122,7 @@ void CFWL_SpinButton::DrawUpButton(CFX_Graphics* pGraphics, pTheme->DrawBackground(¶ms); } -void CFWL_SpinButton::DrawDownButton(CFX_Graphics* pGraphics, +void CFWL_SpinButton::DrawDownButton(CXFA_Graphics* pGraphics, IFWL_ThemeProvider* pTheme, const CFX_Matrix* pMatrix) { CFWL_ThemeBackground params; @@ -182,7 +182,7 @@ void CFWL_SpinButton::OnProcessMessage(CFWL_Message* pMessage) { CFWL_Widget::OnProcessMessage(pMessage); } -void CFWL_SpinButton::OnDrawWidget(CFX_Graphics* pGraphics, +void CFWL_SpinButton::OnDrawWidget(CXFA_Graphics* pGraphics, const CFX_Matrix* pMatrix) { DrawWidget(pGraphics, pMatrix); } diff --git a/xfa/fwl/cfwl_spinbutton.h b/xfa/fwl/cfwl_spinbutton.h index 3cda761f91..2dcb8483f2 100644 --- a/xfa/fwl/cfwl_spinbutton.h +++ b/xfa/fwl/cfwl_spinbutton.h @@ -28,9 +28,9 @@ class CFWL_SpinButton : public CFWL_Widget { FWL_Type GetClassID() const override; void Update() override; FWL_WidgetHit HitTest(const CFX_PointF& point) override; - void DrawWidget(CFX_Graphics* pGraphics, const CFX_Matrix* pMatrix) override; + void DrawWidget(CXFA_Graphics* pGraphics, const CFX_Matrix* pMatrix) override; void OnProcessMessage(CFWL_Message* pMessage) override; - void OnDrawWidget(CFX_Graphics* pGraphics, + void OnDrawWidget(CXFA_Graphics* pGraphics, const CFX_Matrix* pMatrix) override; private: @@ -46,10 +46,10 @@ class CFWL_SpinButton : public CFWL_Widget { void DisableButton(); bool IsUpButtonEnabled(); bool IsDownButtonEnabled(); - void DrawUpButton(CFX_Graphics* pGraphics, + void DrawUpButton(CXFA_Graphics* pGraphics, IFWL_ThemeProvider* pTheme, const CFX_Matrix* pMatrix); - void DrawDownButton(CFX_Graphics* pGraphics, + void DrawDownButton(CXFA_Graphics* pGraphics, IFWL_ThemeProvider* pTheme, const CFX_Matrix* pMatrix); void OnFocusChanged(CFWL_Message* pMsg, bool bSet); diff --git a/xfa/fwl/cfwl_themebackground.h b/xfa/fwl/cfwl_themebackground.h index f23f26e229..0141754c1e 100644 --- a/xfa/fwl/cfwl_themebackground.h +++ b/xfa/fwl/cfwl_themebackground.h @@ -11,16 +11,16 @@ #include "xfa/fwl/cfwl_themepart.h" class CFX_DIBitmpa; -class CFX_Graphics; -class CFX_Path; +class CXFA_Graphics; +class CXFA_Path; class CFWL_ThemeBackground : public CFWL_ThemePart { public: CFWL_ThemeBackground(); ~CFWL_ThemeBackground(); - CFX_Graphics* m_pGraphics; - CFX_Path* m_pPath; + CXFA_Graphics* m_pGraphics; + CXFA_Path* m_pPath; CFX_RetainPtr<CFX_DIBitmap> m_pImage; }; diff --git a/xfa/fwl/cfwl_themetext.h b/xfa/fwl/cfwl_themetext.h index 6cbc465bf3..7c8330e04e 100644 --- a/xfa/fwl/cfwl_themetext.h +++ b/xfa/fwl/cfwl_themetext.h @@ -18,7 +18,7 @@ class CFWL_ThemeText : public CFWL_ThemePart { CFX_WideString m_wsText; uint32_t m_dwTTOStyles; int32_t m_iTTOAlign; - CFX_Graphics* m_pGraphics; + CXFA_Graphics* m_pGraphics; }; #endif // XFA_FWL_CFWL_THEMETEXT_H_ diff --git a/xfa/fwl/cfwl_widget.cpp b/xfa/fwl/cfwl_widget.cpp index 45ae9c0b0c..a2c270c332 100644 --- a/xfa/fwl/cfwl_widget.cpp +++ b/xfa/fwl/cfwl_widget.cpp @@ -518,7 +518,7 @@ void CFWL_Widget::RepaintRect(const CFX_RectF& pRect) { m_pWidgetMgr->RepaintWidget(this, pRect); } -void CFWL_Widget::DrawBackground(CFX_Graphics* pGraphics, +void CFWL_Widget::DrawBackground(CXFA_Graphics* pGraphics, CFWL_Part iPartBk, IFWL_ThemeProvider* pTheme, const CFX_Matrix* pMatrix) { @@ -532,7 +532,7 @@ void CFWL_Widget::DrawBackground(CFX_Graphics* pGraphics, pTheme->DrawBackground(¶m); } -void CFWL_Widget::DrawBorder(CFX_Graphics* pGraphics, +void CFWL_Widget::DrawBorder(CXFA_Graphics* pGraphics, CFWL_Part iPartBorder, IFWL_ThemeProvider* pTheme, const CFX_Matrix* pMatrix) { @@ -610,5 +610,5 @@ void CFWL_Widget::OnProcessMessage(CFWL_Message* pMessage) { void CFWL_Widget::OnProcessEvent(CFWL_Event* pEvent) {} -void CFWL_Widget::OnDrawWidget(CFX_Graphics* pGraphics, +void CFWL_Widget::OnDrawWidget(CXFA_Graphics* pGraphics, const CFX_Matrix* pMatrix) {} diff --git a/xfa/fwl/cfwl_widget.h b/xfa/fwl/cfwl_widget.h index 9bcbf55cbc..316e6f5404 100644 --- a/xfa/fwl/cfwl_widget.h +++ b/xfa/fwl/cfwl_widget.h @@ -63,14 +63,14 @@ class CFWL_Widget : public IFWL_WidgetDelegate { virtual void RemoveStates(uint32_t dwStates); virtual void Update() = 0; virtual FWL_WidgetHit HitTest(const CFX_PointF& point); - virtual void DrawWidget(CFX_Graphics* pGraphics, + virtual void DrawWidget(CXFA_Graphics* pGraphics, const CFX_Matrix* pMatrix) = 0; virtual void SetThemeProvider(IFWL_ThemeProvider* pThemeProvider); // IFWL_WidgetDelegate. void OnProcessMessage(CFWL_Message* pMessage) override; void OnProcessEvent(CFWL_Event* pEvent) override; - void OnDrawWidget(CFX_Graphics* pGraphics, + void OnDrawWidget(CXFA_Graphics* pGraphics, const CFX_Matrix* pMatrix) override; void InflateWidgetRect(CFX_RectF& rect); @@ -143,7 +143,7 @@ class CFWL_Widget : public IFWL_WidgetDelegate { void RegisterEventTarget(CFWL_Widget* pEventSource); void UnregisterEventTarget(); void DispatchEvent(CFWL_Event* pEvent); - void DrawBorder(CFX_Graphics* pGraphics, + void DrawBorder(CXFA_Graphics* pGraphics, CFWL_Part iPartBorder, IFWL_ThemeProvider* pTheme, const CFX_Matrix* pMatrix); @@ -175,7 +175,7 @@ class CFWL_Widget : public IFWL_WidgetDelegate { float fMaxHeight, const CFX_RectF& rtAnchor, CFX_RectF& rtPopup); - void DrawBackground(CFX_Graphics* pGraphics, + void DrawBackground(CXFA_Graphics* pGraphics, CFWL_Part iPartBk, IFWL_ThemeProvider* pTheme, const CFX_Matrix* pMatrix); diff --git a/xfa/fwl/cfwl_widgetmgr.cpp b/xfa/fwl/cfwl_widgetmgr.cpp index 3abe14d89b..eb98f2ee81 100644 --- a/xfa/fwl/cfwl_widgetmgr.cpp +++ b/xfa/fwl/cfwl_widgetmgr.cpp @@ -418,7 +418,7 @@ void CFWL_WidgetMgr::OnProcessMessageToForm(CFWL_Message* pMessage) { } void CFWL_WidgetMgr::OnDrawWidget(CFWL_Widget* pWidget, - CFX_Graphics* pGraphics, + CXFA_Graphics* pGraphics, const CFX_Matrix* pMatrix) { if (!pWidget || !pGraphics) return; @@ -453,7 +453,7 @@ void CFWL_WidgetMgr::OnDrawWidget(CFWL_Widget* pWidget, void CFWL_WidgetMgr::DrawChild(CFWL_Widget* parent, const CFX_RectF& rtClip, - CFX_Graphics* pGraphics, + CXFA_Graphics* pGraphics, const CFX_Matrix* pMatrix) { if (!parent) return; diff --git a/xfa/fwl/cfwl_widgetmgr.h b/xfa/fwl/cfwl_widgetmgr.h index 4c12e707f6..3b26c7155d 100644 --- a/xfa/fwl/cfwl_widgetmgr.h +++ b/xfa/fwl/cfwl_widgetmgr.h @@ -13,14 +13,14 @@ #include "core/fxcrt/fx_system.h" #include "xfa/fwl/ifwl_widgetmgrdelegate.h" -#include "xfa/fxgraphics/cfx_graphics.h" +#include "xfa/fxgraphics/cxfa_graphics.h" #define FWL_WGTMGR_DisableForm 0x00000002 class CFWL_Message; class CXFA_FFApp; class CXFA_FWLAdapterWidgetMgr; -class CFX_Graphics; +class CXFA_Graphics; class CFX_Matrix; class CFWL_Widget; @@ -33,7 +33,7 @@ class CFWL_WidgetMgr : public CFWL_WidgetMgrDelegate { void OnSetCapability(uint32_t dwCapability) override; void OnProcessMessageToForm(CFWL_Message* pMessage) override; void OnDrawWidget(CFWL_Widget* pWidget, - CFX_Graphics* pGraphics, + CXFA_Graphics* pGraphics, const CFX_Matrix* pMatrix) override; CFWL_Widget* GetParentWidget(CFWL_Widget* pWidget) const; @@ -82,7 +82,7 @@ class CFWL_WidgetMgr : public CFWL_WidgetMgrDelegate { Item* pPrevious; Item* pNext; CFWL_Widget* const pWidget; - std::unique_ptr<CFX_Graphics> pOffscreen; + std::unique_ptr<CXFA_Graphics> pOffscreen; int32_t iRedrawCounter; #if (_FX_OS_ == _FX_WIN32_DESKTOP_) || (_FX_OS_ == _FX_WIN64_) bool bOutsideChanged; @@ -103,11 +103,11 @@ class CFWL_WidgetMgr : public CFWL_WidgetMgrDelegate { void DrawChild(CFWL_Widget* pParent, const CFX_RectF& rtClip, - CFX_Graphics* pGraphics, + CXFA_Graphics* pGraphics, const CFX_Matrix* pMatrix); - CFX_Graphics* DrawWidgetBefore(CFWL_Widget* pWidget, - CFX_Graphics* pGraphics, - const CFX_Matrix* pMatrix); + CXFA_Graphics* DrawWidgetBefore(CFWL_Widget* pWidget, + CXFA_Graphics* pGraphics, + const CFX_Matrix* pMatrix); bool IsNeedRepaint(CFWL_Widget* pWidget, CFX_Matrix* pMatrix, const CFX_RectF& rtDirty); diff --git a/xfa/fwl/ifwl_widgetdelegate.h b/xfa/fwl/ifwl_widgetdelegate.h index a96f00dc9e..8dee6da7a9 100644 --- a/xfa/fwl/ifwl_widgetdelegate.h +++ b/xfa/fwl/ifwl_widgetdelegate.h @@ -11,7 +11,7 @@ class CFWL_Event; class CFWL_Message; -class CFX_Graphics; +class CXFA_Graphics; class CFX_Matrix; class IFWL_WidgetDelegate { @@ -20,7 +20,7 @@ class IFWL_WidgetDelegate { virtual void OnProcessMessage(CFWL_Message* pMessage) = 0; virtual void OnProcessEvent(CFWL_Event* pEvent) = 0; - virtual void OnDrawWidget(CFX_Graphics* pGraphics, + virtual void OnDrawWidget(CXFA_Graphics* pGraphics, const CFX_Matrix* pMatrix) = 0; }; diff --git a/xfa/fwl/ifwl_widgetmgrdelegate.h b/xfa/fwl/ifwl_widgetmgrdelegate.h index 9f0b5708b3..46996821c5 100644 --- a/xfa/fwl/ifwl_widgetmgrdelegate.h +++ b/xfa/fwl/ifwl_widgetmgrdelegate.h @@ -8,7 +8,7 @@ #define XFA_FWL_IFWL_WIDGETMGRDELEGATE_H_ class CFWL_Message; -class CFX_Graphics; +class CXFA_Graphics; class CFX_Matrix; class CFWL_Widget; @@ -17,7 +17,7 @@ class CFWL_WidgetMgrDelegate { virtual void OnSetCapability(uint32_t dwCapability) = 0; virtual void OnProcessMessageToForm(CFWL_Message* pMessage) = 0; virtual void OnDrawWidget(CFWL_Widget* pWidget, - CFX_Graphics* pGraphics, + CXFA_Graphics* pGraphics, const CFX_Matrix* pMatrix) = 0; }; diff --git a/xfa/fwl/theme/cfwl_carettp.cpp b/xfa/fwl/theme/cfwl_carettp.cpp index 6d68ba283b..64eef9ffc9 100644 --- a/xfa/fwl/theme/cfwl_carettp.cpp +++ b/xfa/fwl/theme/cfwl_carettp.cpp @@ -9,8 +9,8 @@ #include "xfa/fwl/cfwl_caret.h" #include "xfa/fwl/cfwl_themebackground.h" #include "xfa/fwl/cfwl_widget.h" -#include "xfa/fxgraphics/cfx_path.h" #include "xfa/fxgraphics/cxfa_color.h" +#include "xfa/fxgraphics/cxfa_path.h" CFWL_CaretTP::CFWL_CaretTP() {} CFWL_CaretTP::~CFWL_CaretTP() {} @@ -34,12 +34,12 @@ void CFWL_CaretTP::DrawBackground(CFWL_ThemeBackground* pParams) { } } -void CFWL_CaretTP::DrawCaretBK(CFX_Graphics* pGraphics, +void CFWL_CaretTP::DrawCaretBK(CXFA_Graphics* pGraphics, uint32_t dwStates, const CFX_RectF* pRect, CXFA_Color* crFill, CFX_Matrix* pMatrix) { - CFX_Path path; + CXFA_Path path; CFX_RectF rect = *pRect; path.AddRectangle(rect.left, rect.top, rect.width, rect.height); if (crFill) { diff --git a/xfa/fwl/theme/cfwl_carettp.h b/xfa/fwl/theme/cfwl_carettp.h index 0491ee7b4e..fdf330b8bf 100644 --- a/xfa/fwl/theme/cfwl_carettp.h +++ b/xfa/fwl/theme/cfwl_carettp.h @@ -18,7 +18,7 @@ class CFWL_CaretTP : public CFWL_WidgetTP { void DrawBackground(CFWL_ThemeBackground* pParams) override; protected: - void DrawCaretBK(CFX_Graphics* pGraphics, + void DrawCaretBK(CXFA_Graphics* pGraphics, uint32_t dwStates, const CFX_RectF* pRect, CXFA_Color* crFill, diff --git a/xfa/fwl/theme/cfwl_checkboxtp.cpp b/xfa/fwl/theme/cfwl_checkboxtp.cpp index 7e9fc510c6..334c1912a3 100644 --- a/xfa/fwl/theme/cfwl_checkboxtp.cpp +++ b/xfa/fwl/theme/cfwl_checkboxtp.cpp @@ -13,8 +13,8 @@ #include "xfa/fwl/cfwl_themebackground.h" #include "xfa/fwl/cfwl_themetext.h" #include "xfa/fwl/cfwl_widget.h" -#include "xfa/fxgraphics/cfx_path.h" #include "xfa/fxgraphics/cxfa_color.h" +#include "xfa/fxgraphics/cxfa_path.h" namespace { @@ -56,7 +56,7 @@ void CFWL_CheckBoxTP::DrawText(CFWL_ThemeText* pParams) { CFWL_WidgetTP::DrawText(pParams); } -void CFWL_CheckBoxTP::DrawSignCheck(CFX_Graphics* pGraphics, +void CFWL_CheckBoxTP::DrawSignCheck(CXFA_Graphics* pGraphics, const CFX_RectF* pRtSign, FX_ARGB argbFill, CFX_Matrix* pMatrix) { @@ -74,11 +74,11 @@ void CFWL_CheckBoxTP::DrawSignCheck(CFX_Graphics* pGraphics, pGraphics->RestoreGraphState(); } -void CFWL_CheckBoxTP::DrawSignCircle(CFX_Graphics* pGraphics, +void CFWL_CheckBoxTP::DrawSignCircle(CXFA_Graphics* pGraphics, const CFX_RectF* pRtSign, FX_ARGB argbFill, CFX_Matrix* pMatrix) { - CFX_Path path; + CXFA_Path path; path.AddEllipse(*pRtSign); CXFA_Color crFill(argbFill); pGraphics->SaveGraphState(); @@ -87,11 +87,11 @@ void CFWL_CheckBoxTP::DrawSignCircle(CFX_Graphics* pGraphics, pGraphics->RestoreGraphState(); } -void CFWL_CheckBoxTP::DrawSignCross(CFX_Graphics* pGraphics, +void CFWL_CheckBoxTP::DrawSignCross(CXFA_Graphics* pGraphics, const CFX_RectF* pRtSign, FX_ARGB argbFill, CFX_Matrix* pMatrix) { - CFX_Path path; + CXFA_Path path; float fRight = pRtSign->right(); float fBottom = pRtSign->bottom(); path.AddLine(pRtSign->TopLeft(), CFX_PointF(fRight, fBottom)); @@ -106,11 +106,11 @@ void CFWL_CheckBoxTP::DrawSignCross(CFX_Graphics* pGraphics, pGraphics->RestoreGraphState(); } -void CFWL_CheckBoxTP::DrawSignDiamond(CFX_Graphics* pGraphics, +void CFWL_CheckBoxTP::DrawSignDiamond(CXFA_Graphics* pGraphics, const CFX_RectF* pRtSign, FX_ARGB argbFill, CFX_Matrix* pMatrix) { - CFX_Path path; + CXFA_Path path; float fWidth = pRtSign->width; float fHeight = pRtSign->height; float fBottom = pRtSign->bottom(); @@ -127,11 +127,11 @@ void CFWL_CheckBoxTP::DrawSignDiamond(CFX_Graphics* pGraphics, pGraphics->RestoreGraphState(); } -void CFWL_CheckBoxTP::DrawSignSquare(CFX_Graphics* pGraphics, +void CFWL_CheckBoxTP::DrawSignSquare(CXFA_Graphics* pGraphics, const CFX_RectF* pRtSign, FX_ARGB argbFill, CFX_Matrix* pMatrix) { - CFX_Path path; + CXFA_Path path; path.AddRectangle(pRtSign->left, pRtSign->top, pRtSign->width, pRtSign->height); CXFA_Color crFill(argbFill); @@ -141,11 +141,11 @@ void CFWL_CheckBoxTP::DrawSignSquare(CFX_Graphics* pGraphics, pGraphics->RestoreGraphState(); } -void CFWL_CheckBoxTP::DrawSignStar(CFX_Graphics* pGraphics, +void CFWL_CheckBoxTP::DrawSignStar(CXFA_Graphics* pGraphics, const CFX_RectF* pRtSign, FX_ARGB argbFill, CFX_Matrix* pMatrix) { - CFX_Path path; + CXFA_Path path; float fBottom = pRtSign->bottom(); float fRadius = (pRtSign->top - fBottom) / (1 + static_cast<float>(cos(FX_PI / 5.0f))); @@ -218,7 +218,7 @@ void CFWL_CheckBoxTP::SetThemeData() { void CFWL_CheckBoxTP::InitCheckPath(float fCheckLen) { if (!m_pCheckPath) { - m_pCheckPath = pdfium::MakeUnique<CFX_Path>(); + m_pCheckPath = pdfium::MakeUnique<CXFA_Path>(); float fWidth = kSignPath; float fHeight = -kSignPath; @@ -282,7 +282,7 @@ void CFWL_CheckBoxTP::DrawBackground(CFWL_ThemeBackground* pParams) { } void CFWL_CheckBoxTP::DrawCheckSign(CFWL_Widget* pWidget, - CFX_Graphics* pGraphics, + CXFA_Graphics* pGraphics, const CFX_RectF& pRtBox, int32_t iState, CFX_Matrix* pMatrix) { diff --git a/xfa/fwl/theme/cfwl_checkboxtp.h b/xfa/fwl/theme/cfwl_checkboxtp.h index 1070b12598..97ef5cf20c 100644 --- a/xfa/fwl/theme/cfwl_checkboxtp.h +++ b/xfa/fwl/theme/cfwl_checkboxtp.h @@ -36,31 +36,31 @@ class CFWL_CheckBoxTP : public CFWL_WidgetTP { }; void DrawCheckSign(CFWL_Widget* pWidget, - CFX_Graphics* pGraphics, + CXFA_Graphics* pGraphics, const CFX_RectF& pRtBox, int32_t iState, CFX_Matrix* pMatrix); - void DrawSignCheck(CFX_Graphics* pGraphics, + void DrawSignCheck(CXFA_Graphics* pGraphics, const CFX_RectF* pRtSign, FX_ARGB argbFill, CFX_Matrix* pMatrix); - void DrawSignCircle(CFX_Graphics* pGraphics, + void DrawSignCircle(CXFA_Graphics* pGraphics, const CFX_RectF* pRtSign, FX_ARGB argbFill, CFX_Matrix* pMatrix); - void DrawSignCross(CFX_Graphics* pGraphics, + void DrawSignCross(CXFA_Graphics* pGraphics, const CFX_RectF* pRtSign, FX_ARGB argbFill, CFX_Matrix* pMatrix); - void DrawSignDiamond(CFX_Graphics* pGraphics, + void DrawSignDiamond(CXFA_Graphics* pGraphics, const CFX_RectF* pRtSign, FX_ARGB argbFill, CFX_Matrix* pMatrix); - void DrawSignSquare(CFX_Graphics* pGraphics, + void DrawSignSquare(CXFA_Graphics* pGraphics, const CFX_RectF* pRtSign, FX_ARGB argbFill, CFX_Matrix* pMatrix); - void DrawSignStar(CFX_Graphics* pGraphics, + void DrawSignStar(CXFA_Graphics* pGraphics, const CFX_RectF* pRtSign, FX_ARGB argbFill, CFX_Matrix* pMatrix); @@ -68,7 +68,7 @@ class CFWL_CheckBoxTP : public CFWL_WidgetTP { void InitCheckPath(float fCheckLen); std::unique_ptr<CKBThemeData> m_pThemeData; - std::unique_ptr<CFX_Path> m_pCheckPath; + std::unique_ptr<CXFA_Path> m_pCheckPath; private: void SetThemeData(); diff --git a/xfa/fwl/theme/cfwl_comboboxtp.cpp b/xfa/fwl/theme/cfwl_comboboxtp.cpp index 0136a2ec87..d8852ffe52 100644 --- a/xfa/fwl/theme/cfwl_comboboxtp.cpp +++ b/xfa/fwl/theme/cfwl_comboboxtp.cpp @@ -10,8 +10,8 @@ #include "xfa/fwl/cfwl_themebackground.h" #include "xfa/fwl/cfwl_widget.h" #include "xfa/fwl/ifwl_themeprovider.h" -#include "xfa/fxgraphics/cfx_path.h" #include "xfa/fxgraphics/cxfa_color.h" +#include "xfa/fxgraphics/cxfa_path.h" CFWL_ComboBoxTP::CFWL_ComboBoxTP() {} @@ -27,7 +27,7 @@ void CFWL_ComboBoxTP::DrawBackground(CFWL_ThemeBackground* pParams) { break; } case CFWL_Part::Background: { - CFX_Path path; + CXFA_Path path; CFX_RectF& rect = pParams->m_rtPart; path.AddRectangle(rect.left, rect.top, rect.width, rect.height); FX_ARGB argb_color; @@ -64,7 +64,7 @@ void CFWL_ComboBoxTP::DrawBackground(CFWL_ThemeBackground* pParams) { void CFWL_ComboBoxTP::DrawStrethHandler(CFWL_ThemeBackground* pParams, uint32_t dwStates, CFX_Matrix* pMatrix) { - CFX_Path path; + CXFA_Path path; path.AddRectangle(pParams->m_rtPart.left, pParams->m_rtPart.top, pParams->m_rtPart.width - 1, pParams->m_rtPart.height); CXFA_Color cr(ArgbEncode(0xff, 0xff, 0, 0)); diff --git a/xfa/fwl/theme/cfwl_edittp.cpp b/xfa/fwl/theme/cfwl_edittp.cpp index 249a15afba..b04136ba23 100644 --- a/xfa/fwl/theme/cfwl_edittp.cpp +++ b/xfa/fwl/theme/cfwl_edittp.cpp @@ -11,8 +11,8 @@ #include "xfa/fwl/cfwl_widget.h" #include "xfa/fxfa/app/cxfa_fwltheme.h" #include "xfa/fxfa/cxfa_ffwidget.h" -#include "xfa/fxgraphics/cfx_path.h" #include "xfa/fxgraphics/cxfa_color.h" +#include "xfa/fxgraphics/cxfa_path.h" CFWL_EditTP::CFWL_EditTP() {} @@ -44,7 +44,7 @@ void CFWL_EditTP::DrawBackground(CFWL_ThemeBackground* pParams) { } case CFWL_Part::Background: { if (pParams->m_pPath) { - CFX_Graphics* pGraphics = pParams->m_pGraphics; + CXFA_Graphics* pGraphics = pParams->m_pGraphics; pGraphics->SaveGraphState(); CXFA_Color crSelected(FWLTHEME_COLOR_BKSelected); pGraphics->SetFillColor(&crSelected); @@ -52,7 +52,7 @@ void CFWL_EditTP::DrawBackground(CFWL_ThemeBackground* pParams) { &pParams->m_matrix); pGraphics->RestoreGraphState(); } else { - CFX_Path path; + CXFA_Path path; path.AddRectangle(pParams->m_rtPart.left, pParams->m_rtPart.top, pParams->m_rtPart.width, pParams->m_rtPart.height); CXFA_Color cr(FWLTHEME_COLOR_Background); diff --git a/xfa/fwl/theme/cfwl_listboxtp.cpp b/xfa/fwl/theme/cfwl_listboxtp.cpp index 6a9231d208..caa764f953 100644 --- a/xfa/fwl/theme/cfwl_listboxtp.cpp +++ b/xfa/fwl/theme/cfwl_listboxtp.cpp @@ -9,8 +9,8 @@ #include "xfa/fwl/cfwl_listbox.h" #include "xfa/fwl/cfwl_themebackground.h" #include "xfa/fwl/cfwl_widget.h" -#include "xfa/fxgraphics/cfx_path.h" #include "xfa/fxgraphics/cxfa_color.h" +#include "xfa/fxgraphics/cxfa_path.h" CFWL_ListBoxTP::CFWL_ListBoxTP() {} @@ -59,7 +59,7 @@ void CFWL_ListBoxTP::DrawBackground(CFWL_ThemeBackground* pParams) { } } -void CFWL_ListBoxTP::DrawListBoxItem(CFX_Graphics* pGraphics, +void CFWL_ListBoxTP::DrawListBoxItem(CXFA_Graphics* pGraphics, uint32_t dwStates, const CFX_RectF* prtItem, void* pData, @@ -69,7 +69,7 @@ void CFWL_ListBoxTP::DrawListBoxItem(CFX_Graphics* pGraphics, CXFA_Color crFill(FWLTHEME_COLOR_BKSelected); pGraphics->SetFillColor(&crFill); CFX_RectF rt(*prtItem); - CFX_Path path; + CXFA_Path path; #if (_FX_OS_ == _FX_MACOSX_) path.AddRectangle(rt.left, rt.top, rt.width - 1, rt.height - 1); #else diff --git a/xfa/fwl/theme/cfwl_listboxtp.h b/xfa/fwl/theme/cfwl_listboxtp.h index dcf5ec89be..5dc45af4fe 100644 --- a/xfa/fwl/theme/cfwl_listboxtp.h +++ b/xfa/fwl/theme/cfwl_listboxtp.h @@ -18,7 +18,7 @@ class CFWL_ListBoxTP : public CFWL_WidgetTP { void DrawBackground(CFWL_ThemeBackground* pParams) override; protected: - void DrawListBoxItem(CFX_Graphics* pGraphics, + void DrawListBoxItem(CXFA_Graphics* pGraphics, uint32_t dwStates, const CFX_RectF* prtItem, void* pData = nullptr, diff --git a/xfa/fwl/theme/cfwl_monthcalendartp.cpp b/xfa/fwl/theme/cfwl_monthcalendartp.cpp index 2f075ab7b7..8b73bac668 100644 --- a/xfa/fwl/theme/cfwl_monthcalendartp.cpp +++ b/xfa/fwl/theme/cfwl_monthcalendartp.cpp @@ -12,8 +12,8 @@ #include "xfa/fwl/cfwl_themetext.h" #include "xfa/fwl/cfwl_widget.h" #include "xfa/fwl/ifwl_themeprovider.h" -#include "xfa/fxgraphics/cfx_path.h" #include "xfa/fxgraphics/cxfa_color.h" +#include "xfa/fxgraphics/cxfa_path.h" CFWL_MonthCalendarTP::CFWL_MonthCalendarTP() : m_pThemeData(new MCThemeData) { SetThemeData(); @@ -104,7 +104,7 @@ void CFWL_MonthCalendarTP::DrawText(CFWL_ThemeText* pParams) { void CFWL_MonthCalendarTP::DrawTotalBK(CFWL_ThemeBackground* pParams, CFX_Matrix* pMatrix) { - CFX_Path path; + CXFA_Path path; CFX_RectF rtTotal(pParams->m_rtPart); path.AddRectangle(rtTotal.left, rtTotal.top, rtTotal.width, rtTotal.height); pParams->m_pGraphics->SaveGraphState(); @@ -117,7 +117,7 @@ void CFWL_MonthCalendarTP::DrawTotalBK(CFWL_ThemeBackground* pParams, void CFWL_MonthCalendarTP::DrawHeadBk(CFWL_ThemeBackground* pParams, CFX_Matrix* pMatrix) { - CFX_Path path; + CXFA_Path path; CFX_RectF rtHead = pParams->m_rtPart; path.AddRectangle(rtHead.left, rtHead.top, rtHead.width, rtHead.height); pParams->m_pGraphics->SaveGraphState(); @@ -130,7 +130,7 @@ void CFWL_MonthCalendarTP::DrawHeadBk(CFWL_ThemeBackground* pParams, void CFWL_MonthCalendarTP::DrawLButton(CFWL_ThemeBackground* pParams, CFX_Matrix* pMatrix) { - CFX_Path path; + CXFA_Path path; CFX_RectF rtLBtn = pParams->m_rtPart; path.AddRectangle(rtLBtn.left, rtLBtn.top, rtLBtn.width, rtLBtn.height); pParams->m_pGraphics->SaveGraphState(); @@ -164,7 +164,7 @@ void CFWL_MonthCalendarTP::DrawLButton(CFWL_ThemeBackground* pParams, void CFWL_MonthCalendarTP::DrawRButton(CFWL_ThemeBackground* pParams, CFX_Matrix* pMatrix) { - CFX_Path path; + CXFA_Path path; CFX_RectF rtRBtn = pParams->m_rtPart; path.AddRectangle(rtRBtn.left, rtRBtn.top, rtRBtn.width, rtRBtn.height); pParams->m_pGraphics->SaveGraphState(); @@ -198,7 +198,7 @@ void CFWL_MonthCalendarTP::DrawRButton(CFWL_ThemeBackground* pParams, void CFWL_MonthCalendarTP::DrawHSeperator(CFWL_ThemeBackground* pParams, CFX_Matrix* pMatrix) { - CFX_Path path; + CXFA_Path path; CFX_RectF rtHSep = pParams->m_rtPart; path.MoveTo(CFX_PointF(rtHSep.left, rtHSep.top + rtHSep.height / 2)); path.LineTo(CFX_PointF(rtHSep.right(), rtHSep.top + rtHSep.height / 2)); @@ -212,7 +212,7 @@ void CFWL_MonthCalendarTP::DrawHSeperator(CFWL_ThemeBackground* pParams, void CFWL_MonthCalendarTP::DrawWeekNumSep(CFWL_ThemeBackground* pParams, CFX_Matrix* pMatrix) { - CFX_Path path; + CXFA_Path path; CFX_RectF rtWeekSep = pParams->m_rtPart; path.MoveTo(rtWeekSep.TopLeft()); path.LineTo(rtWeekSep.BottomLeft()); @@ -228,7 +228,7 @@ void CFWL_MonthCalendarTP::DrawDatesInBK(CFWL_ThemeBackground* pParams, CFX_Matrix* pMatrix) { pParams->m_pGraphics->SaveGraphState(); if (pParams->m_dwStates & CFWL_PartState_Selected) { - CFX_Path path; + CXFA_Path path; CFX_RectF rtSelDay = pParams->m_rtPart; path.AddRectangle(rtSelDay.left, rtSelDay.top, rtSelDay.width, rtSelDay.height); @@ -236,7 +236,7 @@ void CFWL_MonthCalendarTP::DrawDatesInBK(CFWL_ThemeBackground* pParams, pParams->m_pGraphics->SetFillColor(&clrSelDayBK); pParams->m_pGraphics->FillPath(&path, FXFILL_WINDING, pMatrix); } else if (pParams->m_dwStates & CFWL_PartState_Hovered) { - CFX_Path path; + CXFA_Path path; CFX_RectF rtSelDay = pParams->m_rtPart; path.AddRectangle(rtSelDay.left, rtSelDay.top, rtSelDay.width, rtSelDay.height); @@ -249,7 +249,7 @@ void CFWL_MonthCalendarTP::DrawDatesInBK(CFWL_ThemeBackground* pParams, void CFWL_MonthCalendarTP::DrawDatesInCircle(CFWL_ThemeBackground* pParams, CFX_Matrix* pMatrix) { - CFX_Path path; + CXFA_Path path; CFX_RectF rtSelDay = pParams->m_rtPart; path.AddRectangle(rtSelDay.left, rtSelDay.top, rtSelDay.width, rtSelDay.height); @@ -262,7 +262,7 @@ void CFWL_MonthCalendarTP::DrawDatesInCircle(CFWL_ThemeBackground* pParams, void CFWL_MonthCalendarTP::DrawTodayCircle(CFWL_ThemeBackground* pParams, CFX_Matrix* pMatrix) { - CFX_Path path; + CXFA_Path path; CFX_RectF rtTodayCircle = pParams->m_rtPart; path.AddRectangle(rtTodayCircle.left, rtTodayCircle.top, rtTodayCircle.width, rtTodayCircle.height); diff --git a/xfa/fwl/theme/cfwl_pushbuttontp.cpp b/xfa/fwl/theme/cfwl_pushbuttontp.cpp index 3ef5072743..d0f5760f44 100644 --- a/xfa/fwl/theme/cfwl_pushbuttontp.cpp +++ b/xfa/fwl/theme/cfwl_pushbuttontp.cpp @@ -10,8 +10,8 @@ #include "xfa/fwl/cfwl_themebackground.h" #include "xfa/fwl/cfwl_widget.h" #include "xfa/fwl/ifwl_themeprovider.h" -#include "xfa/fxgraphics/cfx_path.h" #include "xfa/fxgraphics/cxfa_color.h" +#include "xfa/fxgraphics/cxfa_path.h" #define PUSHBUTTON_SIZE_Corner 2 @@ -32,7 +32,7 @@ void CFWL_PushButtonTP::DrawBackground(CFWL_ThemeBackground* pParams) { float fRight = rect.right(); float fBottom = rect.bottom(); - CFX_Path strokePath; + CXFA_Path strokePath; strokePath.MoveTo( CFX_PointF(rect.left + PUSHBUTTON_SIZE_Corner, rect.top)); strokePath.LineTo(CFX_PointF(fRight - PUSHBUTTON_SIZE_Corner, rect.top)); @@ -48,10 +48,10 @@ void CFWL_PushButtonTP::DrawBackground(CFWL_ThemeBackground* pParams) { strokePath.LineTo( CFX_PointF(rect.left + PUSHBUTTON_SIZE_Corner, rect.top)); - CFX_Path fillPath; + CXFA_Path fillPath; fillPath.AddSubpath(&strokePath); - CFX_Graphics* pGraphics = pParams->m_pGraphics; + CXFA_Graphics* pGraphics = pParams->m_pGraphics; pGraphics->SaveGraphState(); CFX_RectF rtInner(rect); diff --git a/xfa/fwl/theme/cfwl_scrollbartp.cpp b/xfa/fwl/theme/cfwl_scrollbartp.cpp index f0063b4a32..2975888ac2 100644 --- a/xfa/fwl/theme/cfwl_scrollbartp.cpp +++ b/xfa/fwl/theme/cfwl_scrollbartp.cpp @@ -10,8 +10,8 @@ #include "xfa/fwl/cfwl_themebackground.h" #include "xfa/fwl/cfwl_widget.h" #include "xfa/fwl/ifwl_themeprovider.h" -#include "xfa/fxgraphics/cfx_path.h" #include "xfa/fxgraphics/cxfa_color.h" +#include "xfa/fxgraphics/cxfa_path.h" namespace { @@ -38,7 +38,7 @@ void CFWL_ScrollBarTP::DrawBackground(CFWL_ThemeBackground* pParams) { else if (pParams->m_dwStates & CFWL_PartState_Disabled) eState = FWLTHEME_STATE_Disable; - CFX_Graphics* pGraphics = pParams->m_pGraphics; + CXFA_Graphics* pGraphics = pParams->m_pGraphics; CFX_RectF* pRect = &pParams->m_rtPart; bool bVert = !!pWidget->GetStylesEx(); switch (pParams->m_iPart) { @@ -71,7 +71,7 @@ void CFWL_ScrollBarTP::DrawBackground(CFWL_ThemeBackground* pParams) { } } -void CFWL_ScrollBarTP::DrawThumbBtn(CFX_Graphics* pGraphics, +void CFWL_ScrollBarTP::DrawThumbBtn(CXFA_Graphics* pGraphics, const CFX_RectF* pRect, bool bVert, FWLTHEME_STATE eState, @@ -80,7 +80,7 @@ void CFWL_ScrollBarTP::DrawThumbBtn(CFX_Graphics* pGraphics, if (eState < FWLTHEME_STATE_Normal || eState > FWLTHEME_STATE_Disable) return; - CFX_Path path; + CXFA_Path path; CFX_RectF rect(*pRect); if (bVert) { rect.Deflate(1, 0); @@ -117,12 +117,12 @@ void CFWL_ScrollBarTP::DrawThumbBtn(CFX_Graphics* pGraphics, } } -void CFWL_ScrollBarTP::DrawPaw(CFX_Graphics* pGraphics, +void CFWL_ScrollBarTP::DrawPaw(CXFA_Graphics* pGraphics, const CFX_RectF* pRect, bool bVert, FWLTHEME_STATE eState, CFX_Matrix* pMatrix) { - CFX_Path path; + CXFA_Path path; if (bVert) { float fPawLen = kPawLength; if (pRect->width / 2 <= fPawLen) { @@ -200,7 +200,7 @@ void CFWL_ScrollBarTP::DrawPaw(CFX_Graphics* pGraphics, } } -void CFWL_ScrollBarTP::DrawTrack(CFX_Graphics* pGraphics, +void CFWL_ScrollBarTP::DrawTrack(CXFA_Graphics* pGraphics, const CFX_RectF* pRect, bool bVert, FWLTHEME_STATE eState, @@ -211,7 +211,7 @@ void CFWL_ScrollBarTP::DrawTrack(CFX_Graphics* pGraphics, pGraphics->SaveGraphState(); CXFA_Color colorLine(ArgbEncode(255, 238, 237, 229)); - CFX_Path path; + CXFA_Path path; float fRight = pRect->right(); float fBottom = pRect->bottom(); if (bVert) { @@ -235,7 +235,7 @@ void CFWL_ScrollBarTP::DrawTrack(CFX_Graphics* pGraphics, m_pThemeData->clrTrackBKEnd, &path, FXFILL_WINDING, pMatrix); } -void CFWL_ScrollBarTP::DrawMaxMinBtn(CFX_Graphics* pGraphics, +void CFWL_ScrollBarTP::DrawMaxMinBtn(CXFA_Graphics* pGraphics, const CFX_RectF* pRect, FWLTHEME_DIRECTION eDict, FWLTHEME_STATE eState, diff --git a/xfa/fwl/theme/cfwl_scrollbartp.h b/xfa/fwl/theme/cfwl_scrollbartp.h index 2389eff3c9..eec372c660 100644 --- a/xfa/fwl/theme/cfwl_scrollbartp.h +++ b/xfa/fwl/theme/cfwl_scrollbartp.h @@ -29,24 +29,24 @@ class CFWL_ScrollBarTP : public CFWL_WidgetTP { FX_ARGB clrTrackBKEnd; }; - void DrawThumbBtn(CFX_Graphics* pGraphics, + void DrawThumbBtn(CXFA_Graphics* pGraphics, const CFX_RectF* pRect, bool bVert, FWLTHEME_STATE eState, bool bPawButton = true, CFX_Matrix* pMatrix = nullptr); - void DrawTrack(CFX_Graphics* pGraphics, + void DrawTrack(CXFA_Graphics* pGraphics, const CFX_RectF* pRect, bool bVert, FWLTHEME_STATE eState, bool bLowerTrack, CFX_Matrix* pMatrix = nullptr); - void DrawMaxMinBtn(CFX_Graphics* pGraphics, + void DrawMaxMinBtn(CXFA_Graphics* pGraphics, const CFX_RectF* pRect, FWLTHEME_DIRECTION eDict, FWLTHEME_STATE eState, CFX_Matrix* pMatrix = nullptr); - void DrawPaw(CFX_Graphics* pGraphics, + void DrawPaw(CXFA_Graphics* pGraphics, const CFX_RectF* pRect, bool bVert, FWLTHEME_STATE eState, diff --git a/xfa/fwl/theme/cfwl_widgettp.cpp b/xfa/fwl/theme/cfwl_widgettp.cpp index 07df4fa17c..90a144fcc1 100644 --- a/xfa/fwl/theme/cfwl_widgettp.cpp +++ b/xfa/fwl/theme/cfwl_widgettp.cpp @@ -19,9 +19,9 @@ #include "xfa/fwl/cfwl_widget.h" #include "xfa/fwl/cfwl_widgetmgr.h" #include "xfa/fwl/ifwl_themeprovider.h" -#include "xfa/fxgraphics/cfx_path.h" -#include "xfa/fxgraphics/cfx_shading.h" #include "xfa/fxgraphics/cxfa_color.h" +#include "xfa/fxgraphics/cxfa_path.h" +#include "xfa/fxgraphics/cxfa_shading.h" CFWL_WidgetTP::CFWL_WidgetTP() : m_dwRefCount(1), m_pFDEFont(nullptr), m_pColorData(nullptr) {} @@ -45,7 +45,7 @@ void CFWL_WidgetTP::DrawText(CFWL_ThemeText* pParams) { if (iLen <= 0) return; - CFX_Graphics* pGraphics = pParams->m_pGraphics; + CXFA_Graphics* pGraphics = pParams->m_pGraphics; m_pTextOut->SetRenderDevice(pGraphics->GetRenderDevice()); m_pTextOut->SetStyles(pParams->m_dwTTOStyles); m_pTextOut->SetAlignment(pParams->m_iTTOAlign); @@ -96,14 +96,14 @@ void CFWL_WidgetTP::FinalizeTTO() { m_pTextOut.reset(); } -void CFWL_WidgetTP::DrawBorder(CFX_Graphics* pGraphics, +void CFWL_WidgetTP::DrawBorder(CXFA_Graphics* pGraphics, const CFX_RectF* pRect, CFX_Matrix* pMatrix) { if (!pGraphics) return; if (!pRect) return; - CFX_Path path; + CXFA_Path path; path.AddRectangle(pRect->left, pRect->top, pRect->width, pRect->height); path.AddRectangle(pRect->left + 1, pRect->top + 1, pRect->width - 2, pRect->height - 2); @@ -114,13 +114,13 @@ void CFWL_WidgetTP::DrawBorder(CFX_Graphics* pGraphics, pGraphics->RestoreGraphState(); } -void CFWL_WidgetTP::FillBackground(CFX_Graphics* pGraphics, +void CFWL_WidgetTP::FillBackground(CXFA_Graphics* pGraphics, const CFX_RectF* pRect, CFX_Matrix* pMatrix) { FillSoildRect(pGraphics, FWLTHEME_COLOR_Background, pRect, pMatrix); } -void CFWL_WidgetTP::FillSoildRect(CFX_Graphics* pGraphics, +void CFWL_WidgetTP::FillSoildRect(CXFA_Graphics* pGraphics, FX_ARGB fillColor, const CFX_RectF* pRect, CFX_Matrix* pMatrix) { @@ -131,20 +131,20 @@ void CFWL_WidgetTP::FillSoildRect(CFX_Graphics* pGraphics, pGraphics->SaveGraphState(); CXFA_Color crFill(fillColor); pGraphics->SetFillColor(&crFill); - CFX_Path path; + CXFA_Path path; path.AddRectangle(pRect->left, pRect->top, pRect->width, pRect->height); pGraphics->FillPath(&path, FXFILL_WINDING, pMatrix); pGraphics->RestoreGraphState(); } -void CFWL_WidgetTP::DrawAxialShading(CFX_Graphics* pGraphics, +void CFWL_WidgetTP::DrawAxialShading(CXFA_Graphics* pGraphics, float fx1, float fy1, float fx2, float fy2, FX_ARGB beginColor, FX_ARGB endColor, - CFX_Path* path, + CXFA_Path* path, int32_t fillMode, CFX_Matrix* pMatrix) { if (!pGraphics || !path) @@ -152,7 +152,7 @@ void CFWL_WidgetTP::DrawAxialShading(CFX_Graphics* pGraphics, CFX_PointF begPoint(fx1, fy1); CFX_PointF endPoint(fx2, fy2); - CFX_Shading shading(begPoint, endPoint, false, false, beginColor, endColor); + CXFA_Shading shading(begPoint, endPoint, false, false, beginColor, endColor); pGraphics->SaveGraphState(); CXFA_Color color1(&shading); pGraphics->SetFillColor(&color1); @@ -160,7 +160,7 @@ void CFWL_WidgetTP::DrawAxialShading(CFX_Graphics* pGraphics, pGraphics->RestoreGraphState(); } -void CFWL_WidgetTP::DrawFocus(CFX_Graphics* pGraphics, +void CFWL_WidgetTP::DrawFocus(CXFA_Graphics* pGraphics, const CFX_RectF* pRect, CFX_Matrix* pMatrix) { if (!pGraphics) @@ -172,13 +172,13 @@ void CFWL_WidgetTP::DrawFocus(CFX_Graphics* pGraphics, pGraphics->SetStrokeColor(&cr); float DashPattern[2] = {1, 1}; pGraphics->SetLineDash(0.0f, DashPattern, 2); - CFX_Path path; + CXFA_Path path; path.AddRectangle(pRect->left, pRect->top, pRect->width, pRect->height); pGraphics->StrokePath(&path, pMatrix); pGraphics->RestoreGraphState(); } -void CFWL_WidgetTP::DrawArrow(CFX_Graphics* pGraphics, +void CFWL_WidgetTP::DrawArrow(CXFA_Graphics* pGraphics, const CFX_RectF* pRect, FWLTHEME_DIRECTION eDict, FX_ARGB argSign, @@ -189,7 +189,7 @@ void CFWL_WidgetTP::DrawArrow(CFX_Graphics* pGraphics, (float)(((pRect->width - (bVert ? 9 : 6)) / 2 + pRect->left) + 0.5); float fTop = (float)(((pRect->height - (bVert ? 6 : 9)) / 2 + pRect->top) + 0.5); - CFX_Path path; + CXFA_Path path; switch (eDict) { case FWLTHEME_DIRECTION_Down: { path.MoveTo(CFX_PointF(fLeft, fTop + 1)); @@ -233,11 +233,11 @@ void CFWL_WidgetTP::DrawArrow(CFX_Graphics* pGraphics, pGraphics->FillPath(&path, FXFILL_WINDING, pMatrix); } -void CFWL_WidgetTP::DrawBtn(CFX_Graphics* pGraphics, +void CFWL_WidgetTP::DrawBtn(CXFA_Graphics* pGraphics, const CFX_RectF* pRect, FWLTHEME_STATE eState, CFX_Matrix* pMatrix) { - CFX_Path path; + CXFA_Path path; InitializeArrowColorData(); float fRight = pRect->right(); @@ -254,7 +254,7 @@ void CFWL_WidgetTP::DrawBtn(CFX_Graphics* pGraphics, pGraphics->StrokePath(&path, pMatrix); } -void CFWL_WidgetTP::DrawArrowBtn(CFX_Graphics* pGraphics, +void CFWL_WidgetTP::DrawArrowBtn(CXFA_Graphics* pGraphics, const CFX_RectF* pRect, FWLTHEME_DIRECTION eDict, FWLTHEME_STATE eState, diff --git a/xfa/fwl/theme/cfwl_widgettp.h b/xfa/fwl/theme/cfwl_widgettp.h index 730a39cd17..229b9ea7c3 100644 --- a/xfa/fwl/theme/cfwl_widgettp.h +++ b/xfa/fwl/theme/cfwl_widgettp.h @@ -15,7 +15,7 @@ #include "core/fxcrt/fx_system.h" #include "xfa/fgas/font/cfgas_gefont.h" #include "xfa/fwl/theme/cfwl_utils.h" -#include "xfa/fxgraphics/cfx_graphics.h" +#include "xfa/fxgraphics/cxfa_graphics.h" class CFDE_TextOut; class CFGAS_GEFont; @@ -55,39 +55,39 @@ class CFWL_WidgetTP { void InitTTO(); void FinalizeTTO(); - void DrawBorder(CFX_Graphics* pGraphics, + void DrawBorder(CXFA_Graphics* pGraphics, const CFX_RectF* pRect, CFX_Matrix* pMatrix = nullptr); - void FillBackground(CFX_Graphics* pGraphics, + void FillBackground(CXFA_Graphics* pGraphics, const CFX_RectF* pRect, CFX_Matrix* pMatrix = nullptr); - void FillSoildRect(CFX_Graphics* pGraphics, + void FillSoildRect(CXFA_Graphics* pGraphics, FX_ARGB fillColor, const CFX_RectF* pRect, CFX_Matrix* pMatrix = nullptr); - void DrawAxialShading(CFX_Graphics* pGraphics, + void DrawAxialShading(CXFA_Graphics* pGraphics, float fx1, float fy1, float fx2, float fy2, FX_ARGB beginColor, FX_ARGB endColor, - CFX_Path* path, + CXFA_Path* path, int32_t fillMode = FXFILL_WINDING, CFX_Matrix* pMatrix = nullptr); - void DrawFocus(CFX_Graphics* pGraphics, + void DrawFocus(CXFA_Graphics* pGraphics, const CFX_RectF* pRect, CFX_Matrix* pMatrix = nullptr); - void DrawArrow(CFX_Graphics* pGraphics, + void DrawArrow(CXFA_Graphics* pGraphics, const CFX_RectF* pRect, FWLTHEME_DIRECTION eDict, FX_ARGB argSign, CFX_Matrix* pMatrix = nullptr); - void DrawBtn(CFX_Graphics* pGraphics, + void DrawBtn(CXFA_Graphics* pGraphics, const CFX_RectF* pRect, FWLTHEME_STATE eState, CFX_Matrix* pMatrix = nullptr); - void DrawArrowBtn(CFX_Graphics* pGraphics, + void DrawArrowBtn(CXFA_Graphics* pGraphics, const CFX_RectF* pRect, FWLTHEME_DIRECTION eDict, FWLTHEME_STATE eState, |