summaryrefslogtreecommitdiff
path: root/xfa/fwl/theme
diff options
context:
space:
mode:
Diffstat (limited to 'xfa/fwl/theme')
-rw-r--r--xfa/fwl/theme/cfwl_carettp.cpp6
-rw-r--r--xfa/fwl/theme/cfwl_carettp.h2
-rw-r--r--xfa/fwl/theme/cfwl_checkboxtp.cpp28
-rw-r--r--xfa/fwl/theme/cfwl_checkboxtp.h16
-rw-r--r--xfa/fwl/theme/cfwl_comboboxtp.cpp6
-rw-r--r--xfa/fwl/theme/cfwl_edittp.cpp6
-rw-r--r--xfa/fwl/theme/cfwl_listboxtp.cpp6
-rw-r--r--xfa/fwl/theme/cfwl_listboxtp.h2
-rw-r--r--xfa/fwl/theme/cfwl_monthcalendartp.cpp22
-rw-r--r--xfa/fwl/theme/cfwl_pushbuttontp.cpp8
-rw-r--r--xfa/fwl/theme/cfwl_scrollbartp.cpp18
-rw-r--r--xfa/fwl/theme/cfwl_scrollbartp.h8
-rw-r--r--xfa/fwl/theme/cfwl_widgettp.cpp36
-rw-r--r--xfa/fwl/theme/cfwl_widgettp.h20
14 files changed, 92 insertions, 92 deletions
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,
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-10 23:41:22 +0000