diff options
Diffstat (limited to 'xfa/fwl/theme/cfwl_checkboxtp.cpp')
| -rw-r--r-- | xfa/fwl/theme/cfwl_checkboxtp.cpp | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/xfa/fwl/theme/cfwl_checkboxtp.cpp b/xfa/fwl/theme/cfwl_checkboxtp.cpp index 8d73738aab..82fdc1a18a 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/cxfa_color.h" -#include "xfa/fxgraphics/cxfa_path.h" +#include "xfa/fxgraphics/cxfa_gecolor.h" +#include "xfa/fxgraphics/cxfa_gepath.h" namespace { @@ -74,7 +74,7 @@ void CFWL_CheckBoxTP::DrawSignCheck(CXFA_Graphics* pGraphics, mt.Translate(pRtSign->left, pRtSign->top); mt.Concat(*pMatrix); pGraphics->SaveGraphState(); - pGraphics->SetFillColor(CXFA_Color(argbFill)); + pGraphics->SetFillColor(CXFA_GEColor(argbFill)); pGraphics->FillPath(m_pCheckPath.get(), FXFILL_WINDING, &mt); pGraphics->RestoreGraphState(); } @@ -83,10 +83,10 @@ void CFWL_CheckBoxTP::DrawSignCircle(CXFA_Graphics* pGraphics, const CFX_RectF* pRtSign, FX_ARGB argbFill, CFX_Matrix* pMatrix) { - CXFA_Path path; + CXFA_GEPath path; path.AddEllipse(*pRtSign); pGraphics->SaveGraphState(); - pGraphics->SetFillColor(CXFA_Color(argbFill)); + pGraphics->SetFillColor(CXFA_GEColor(argbFill)); pGraphics->FillPath(&path, FXFILL_WINDING, pMatrix); pGraphics->RestoreGraphState(); } @@ -95,7 +95,7 @@ void CFWL_CheckBoxTP::DrawSignCross(CXFA_Graphics* pGraphics, const CFX_RectF* pRtSign, FX_ARGB argbFill, CFX_Matrix* pMatrix) { - CXFA_Path path; + CXFA_GEPath path; float fRight = pRtSign->right(); float fBottom = pRtSign->bottom(); path.AddLine(pRtSign->TopLeft(), CFX_PointF(fRight, fBottom)); @@ -103,7 +103,7 @@ void CFWL_CheckBoxTP::DrawSignCross(CXFA_Graphics* pGraphics, CFX_PointF(fRight, pRtSign->top)); pGraphics->SaveGraphState(); - pGraphics->SetStrokeColor(CXFA_Color(argbFill)); + pGraphics->SetStrokeColor(CXFA_GEColor(argbFill)); pGraphics->SetLineWidth(1.0f); pGraphics->StrokePath(&path, pMatrix); pGraphics->RestoreGraphState(); @@ -113,7 +113,7 @@ void CFWL_CheckBoxTP::DrawSignDiamond(CXFA_Graphics* pGraphics, const CFX_RectF* pRtSign, FX_ARGB argbFill, CFX_Matrix* pMatrix) { - CXFA_Path path; + CXFA_GEPath path; float fWidth = pRtSign->width; float fHeight = pRtSign->height; float fBottom = pRtSign->bottom(); @@ -124,7 +124,7 @@ void CFWL_CheckBoxTP::DrawSignDiamond(CXFA_Graphics* pGraphics, path.LineTo(CFX_PointF(pRtSign->left + fWidth / 2, pRtSign->top)); pGraphics->SaveGraphState(); - pGraphics->SetFillColor(CXFA_Color(argbFill)); + pGraphics->SetFillColor(CXFA_GEColor(argbFill)); pGraphics->FillPath(&path, FXFILL_WINDING, pMatrix); pGraphics->RestoreGraphState(); } @@ -133,11 +133,11 @@ void CFWL_CheckBoxTP::DrawSignSquare(CXFA_Graphics* pGraphics, const CFX_RectF* pRtSign, FX_ARGB argbFill, CFX_Matrix* pMatrix) { - CXFA_Path path; + CXFA_GEPath path; path.AddRectangle(pRtSign->left, pRtSign->top, pRtSign->width, pRtSign->height); pGraphics->SaveGraphState(); - pGraphics->SetFillColor(CXFA_Color(argbFill)); + pGraphics->SetFillColor(CXFA_GEColor(argbFill)); pGraphics->FillPath(&path, FXFILL_WINDING, pMatrix); pGraphics->RestoreGraphState(); } @@ -146,7 +146,7 @@ void CFWL_CheckBoxTP::DrawSignStar(CXFA_Graphics* pGraphics, const CFX_RectF* pRtSign, FX_ARGB argbFill, CFX_Matrix* pMatrix) { - CXFA_Path path; + CXFA_GEPath path; float fBottom = pRtSign->bottom(); float fRadius = (pRtSign->top - fBottom) / (1 + static_cast<float>(cos(FX_PI / 5.0f))); @@ -172,7 +172,7 @@ void CFWL_CheckBoxTP::DrawSignStar(CXFA_Graphics* pGraphics, path.LineTo(points[nNext]); } pGraphics->SaveGraphState(); - pGraphics->SetFillColor(CXFA_Color(argbFill)); + pGraphics->SetFillColor(CXFA_GEColor(argbFill)); pGraphics->FillPath(&path, FXFILL_WINDING, pMatrix); pGraphics->RestoreGraphState(); } @@ -217,7 +217,7 @@ void CFWL_CheckBoxTP::SetThemeData() { void CFWL_CheckBoxTP::InitCheckPath(float fCheckLen) { if (!m_pCheckPath) { - m_pCheckPath = pdfium::MakeUnique<CXFA_Path>(); + m_pCheckPath = pdfium::MakeUnique<CXFA_GEPath>(); float fWidth = kSignPath; float fHeight = -kSignPath; |