summaryrefslogtreecommitdiff
path: root/xfa/fxfa/app
diff options
context:
space:
mode:
Diffstat (limited to 'xfa/fxfa/app')
-rw-r--r--xfa/fxfa/app/cxfa_fffield.cpp6
-rw-r--r--xfa/fxfa/app/cxfa_ffline.cpp4
-rw-r--r--xfa/fxfa/app/cxfa_ffpushbutton.cpp6
-rw-r--r--xfa/fxfa/app/cxfa_fwltheme.cpp2
4 files changed, 9 insertions, 9 deletions
diff --git a/xfa/fxfa/app/cxfa_fffield.cpp b/xfa/fxfa/app/cxfa_fffield.cpp
index fe56917cb6..09773b6737 100644
--- a/xfa/fxfa/app/cxfa_fffield.cpp
+++ b/xfa/fxfa/app/cxfa_fffield.cpp
@@ -23,8 +23,8 @@
#include "xfa/fxfa/cxfa_ffpageview.h"
#include "xfa/fxfa/cxfa_ffwidget.h"
#include "xfa/fxfa/parser/cxfa_node.h"
-#include "xfa/fxgraphics/cfx_color.h"
#include "xfa/fxgraphics/cfx_path.h"
+#include "xfa/fxgraphics/cxfa_color.h"
namespace {
@@ -93,7 +93,7 @@ void CXFA_FFField::DrawHighlight(CFX_Graphics* pGS,
}
CXFA_FFDoc* pDoc = GetDoc();
- CFX_Color crHighlight(pDoc->GetDocEnvironment()->GetHighlightColor(pDoc));
+ CXFA_Color crHighlight(pDoc->GetDocEnvironment()->GetHighlightColor(pDoc));
pGS->SetFillColor(&crHighlight);
CFX_Path path;
if (bEllipse)
@@ -108,7 +108,7 @@ void CXFA_FFField::DrawFocus(CFX_Graphics* pGS, CFX_Matrix* pMatrix) {
if (!(m_dwStatus & XFA_WidgetStatus_Focused))
return;
- CFX_Color cr(0xFF000000);
+ CXFA_Color cr(0xFF000000);
pGS->SetStrokeColor(&cr);
float DashPattern[2] = {1, 1};
diff --git a/xfa/fxfa/app/cxfa_ffline.cpp b/xfa/fxfa/app/cxfa_ffline.cpp
index 67ed7ebd1a..dafa660a73 100644
--- a/xfa/fxfa/app/cxfa_ffline.cpp
+++ b/xfa/fxfa/app/cxfa_ffline.cpp
@@ -6,9 +6,9 @@
#include "xfa/fxfa/app/cxfa_ffline.h"
-#include "xfa/fxgraphics/cfx_color.h"
#include "xfa/fxgraphics/cfx_graphics.h"
#include "xfa/fxgraphics/cfx_path.h"
+#include "xfa/fxgraphics/cxfa_color.h"
CXFA_FFLine::CXFA_FFLine(CXFA_WidgetAcc* pDataAcc) : CXFA_FFDraw(pDataAcc) {}
@@ -88,7 +88,7 @@ void CXFA_FFLine::RenderWidget(CFX_Graphics* pGS,
else
linePath.AddLine(rtLine.TopLeft(), rtLine.BottomRight());
- CFX_Color color(lineColor);
+ CXFA_Color color(lineColor);
pGS->SaveGraphState();
pGS->SetLineWidth(fLineWidth, true);
XFA_StrokeTypeSetLineDash(pGS, iStrokeType, iCap);
diff --git a/xfa/fxfa/app/cxfa_ffpushbutton.cpp b/xfa/fxfa/app/cxfa_ffpushbutton.cpp
index 1e784a496e..21e4b977a1 100644
--- a/xfa/fxfa/app/cxfa_ffpushbutton.cpp
+++ b/xfa/fxfa/app/cxfa_ffpushbutton.cpp
@@ -18,8 +18,8 @@
#include "xfa/fxfa/cxfa_ffapp.h"
#include "xfa/fxfa/cxfa_ffpageview.h"
#include "xfa/fxfa/cxfa_ffwidget.h"
-#include "xfa/fxgraphics/cfx_color.h"
#include "xfa/fxgraphics/cfx_path.h"
+#include "xfa/fxgraphics/cxfa_color.h"
CXFA_FFPushButton::CXFA_FFPushButton(CXFA_WidgetAcc* pDataAcc)
: CXFA_FFField(pDataAcc), m_pOldDelegate(nullptr) {}
@@ -213,7 +213,7 @@ void CXFA_FFPushButton::OnDrawWidget(CFX_Graphics* pGraphics,
CFX_RectF rtFill(0, 0, m_pNormalWidget->GetWidgetRect().Size());
float fLineWith = GetLineWidth();
rtFill.Deflate(fLineWith, fLineWith);
- CFX_Color cr(FXARGB_MAKE(128, 128, 255, 255));
+ CXFA_Color cr(FXARGB_MAKE(128, 128, 255, 255));
pGraphics->SetFillColor(&cr);
CFX_Path path;
@@ -227,7 +227,7 @@ void CXFA_FFPushButton::OnDrawWidget(CFX_Graphics* pGraphics,
if ((m_pNormalWidget->GetStates() & FWL_STATE_PSB_Pressed) &&
(m_pNormalWidget->GetStates() & FWL_STATE_PSB_Hovered)) {
float fLineWidth = GetLineWidth();
- CFX_Color cr(FXARGB_MAKE(255, 128, 255, 255));
+ CXFA_Color cr(FXARGB_MAKE(255, 128, 255, 255));
pGraphics->SetStrokeColor(&cr);
pGraphics->SetLineWidth(fLineWidth);
diff --git a/xfa/fxfa/app/cxfa_fwltheme.cpp b/xfa/fxfa/app/cxfa_fwltheme.cpp
index 5f8e1dc7dc..fbcbd75b6e 100644
--- a/xfa/fxfa/app/cxfa_fwltheme.cpp
+++ b/xfa/fxfa/app/cxfa_fwltheme.cpp
@@ -24,7 +24,7 @@
#include "xfa/fwl/cfwl_themetext.h"
#include "xfa/fxfa/cxfa_ffapp.h"
#include "xfa/fxfa/cxfa_ffwidget.h"
-#include "xfa/fxgraphics/cfx_color.h"
+#include "xfa/fxgraphics/cxfa_color.h"
namespace {