From 8e7f932410732a4f05d2e69e9ff66277f54d1bd7 Mon Sep 17 00:00:00 2001 From: Dan Sinclair Date: Mon, 16 Oct 2017 11:35:42 -0400 Subject: Convert CPVT_Color to CFX_Color This CL converts the use of CPVT_Color to CFX_Color and removes the CPVT_Color class. Change-Id: I86a2d06524cd8f0fbce2335f0185426cc41dbe84 Reviewed-on: https://pdfium-review.googlesource.com/16030 Reviewed-by: Ryan Harrison Commit-Queue: dsinclair --- fpdfsdk/cpdfsdk_widget.cpp | 10 ++--- fpdfsdk/formfiller/cffl_formfiller.cpp | 2 +- fpdfsdk/fpdfannot.cpp | 13 ++++--- fpdfsdk/javascript/Field.cpp | 41 ++++++++++---------- fpdfsdk/javascript/color.cpp | 50 ++++++++++++------------ fpdfsdk/pwl/cpwl_appstream.cpp | 70 +++++++++++++++++----------------- fpdfsdk/pwl/cpwl_combo_box.cpp | 6 +-- fpdfsdk/pwl/cpwl_scroll_bar.cpp | 2 +- fpdfsdk/pwl/cpwl_wnd.cpp | 6 +-- fpdfsdk/pwl/cpwl_wnd.h | 4 +- 10 files changed, 103 insertions(+), 101 deletions(-) (limited to 'fpdfsdk') diff --git a/fpdfsdk/cpdfsdk_widget.cpp b/fpdfsdk/cpdfsdk_widget.cpp index a859dcd374..c8bd4eaf08 100644 --- a/fpdfsdk/cpdfsdk_widget.cpp +++ b/fpdfsdk/cpdfsdk_widget.cpp @@ -562,14 +562,14 @@ bool CPDFSDK_Widget::GetFillColor(FX_COLORREF& color) const { CPDF_FormControl* pFormCtrl = GetFormControl(); int iColorType = 0; color = ARGBToColorRef(pFormCtrl->GetBackgroundColor(iColorType)); - return iColorType != COLORTYPE_TRANSPARENT; + return iColorType != CFX_Color::kTransparent; } bool CPDFSDK_Widget::GetBorderColor(FX_COLORREF& color) const { CPDF_FormControl* pFormCtrl = GetFormControl(); int iColorType = 0; color = ARGBToColorRef(pFormCtrl->GetBorderColor(iColorType)); - return iColorType != COLORTYPE_TRANSPARENT; + return iColorType != CFX_Color::kTransparent; } bool CPDFSDK_Widget::GetTextColor(FX_COLORREF& color) const { @@ -579,10 +579,10 @@ bool CPDFSDK_Widget::GetTextColor(FX_COLORREF& color) const { return false; FX_ARGB argb; - int iColorType = COLORTYPE_TRANSPARENT; + int iColorType = CFX_Color::kTransparent; da.GetColor(argb, iColorType); color = ARGBToColorRef(argb); - return iColorType != COLORTYPE_TRANSPARENT; + return iColorType != CFX_Color::kTransparent; } float CPDFSDK_Widget::GetFontSize() const { @@ -919,7 +919,7 @@ CFX_Matrix CPDFSDK_Widget::GetMatrix() const { } CFX_Color CPDFSDK_Widget::GetTextPWLColor() const { - CFX_Color crText = CFX_Color(COLORTYPE_GRAY, 0); + CFX_Color crText = CFX_Color(CFX_Color::kGray, 0); CPDF_FormControl* pFormCtrl = GetFormControl(); CPDF_DefaultAppearance da = pFormCtrl->GetDefaultAppearance(); diff --git a/fpdfsdk/formfiller/cffl_formfiller.cpp b/fpdfsdk/formfiller/cffl_formfiller.cpp index 8f48c029da..f86cb68c59 100644 --- a/fpdfsdk/formfiller/cffl_formfiller.cpp +++ b/fpdfsdk/formfiller/cffl_formfiller.cpp @@ -301,7 +301,7 @@ CPWL_Wnd::CreateParams CFFL_FormFiller::GetCreateParam() { if (m_pWidget->GetBorderColor(color)) cp.sBorderColor = CFX_Color(color); - cp.sTextColor = CFX_Color(COLORTYPE_GRAY, 0); + cp.sTextColor = CFX_Color(CFX_Color::kGray, 0); if (m_pWidget->GetTextColor(color)) cp.sTextColor = CFX_Color(color); diff --git a/fpdfsdk/fpdfannot.cpp b/fpdfsdk/fpdfannot.cpp index 3125ad1a82..a671032b1e 100644 --- a/fpdfsdk/fpdfannot.cpp +++ b/fpdfsdk/fpdfannot.cpp @@ -20,8 +20,8 @@ #include "core/fpdfdoc/cpdf_annot.h" #include "core/fpdfdoc/cpdf_formfield.h" #include "core/fpdfdoc/cpdf_interform.h" -#include "core/fpdfdoc/cpvt_color.h" #include "core/fpdfdoc/cpvt_generateap.h" +#include "core/fxge/cfx_color.h" #include "fpdfsdk/fsdk_define.h" namespace { @@ -536,24 +536,25 @@ FPDF_EXPORT FPDF_BOOL FPDF_CALLCONV FPDFAnnot_GetColor(FPDF_ANNOTATION annot, } return true; } - CPVT_Color color = CPVT_Color::ParseColor(*pColor); + + CFX_Color color = CFX_Color::ParseColor(*pColor); switch (color.nColorType) { - case CPVT_Color::kRGB: + case CFX_Color::kRGB: *R = color.fColor1 * 255.f; *G = color.fColor2 * 255.f; *B = color.fColor3 * 255.f; break; - case CPVT_Color::kGray: + case CFX_Color::kGray: *R = 255.f * color.fColor1; *G = 255.f * color.fColor1; *B = 255.f * color.fColor1; break; - case CPVT_Color::kCMYK: + case CFX_Color::kCMYK: *R = 255.f * (1 - color.fColor1) * (1 - color.fColor4); *G = 255.f * (1 - color.fColor2) * (1 - color.fColor4); *B = 255.f * (1 - color.fColor3) * (1 - color.fColor4); break; - case CPVT_Color::kTransparent: + case CFX_Color::kTransparent: *R = 0; *G = 0; *B = 0; diff --git a/fpdfsdk/javascript/Field.cpp b/fpdfsdk/javascript/Field.cpp index da0e60cc18..4e40e6fce5 100644 --- a/fpdfsdk/javascript/Field.cpp +++ b/fpdfsdk/javascript/Field.cpp @@ -1453,19 +1453,19 @@ bool Field::fillColor(CJS_Runtime* pRuntime, pFormControl->GetBackgroundColor(iColorType); CFX_Color color; - if (iColorType == COLORTYPE_TRANSPARENT) { - color = CFX_Color(COLORTYPE_TRANSPARENT); - } else if (iColorType == COLORTYPE_GRAY) { + if (iColorType == CFX_Color::kTransparent) { + color = CFX_Color(CFX_Color::kTransparent); + } else if (iColorType == CFX_Color::kGray) { + color = CFX_Color(CFX_Color::kGray, + pFormControl->GetOriginalBackgroundColor(0)); + } else if (iColorType == CFX_Color::kRGB) { color = - CFX_Color(COLORTYPE_GRAY, pFormControl->GetOriginalBackgroundColor(0)); - } else if (iColorType == COLORTYPE_RGB) { - color = - CFX_Color(COLORTYPE_RGB, pFormControl->GetOriginalBackgroundColor(0), + CFX_Color(CFX_Color::kRGB, pFormControl->GetOriginalBackgroundColor(0), pFormControl->GetOriginalBackgroundColor(1), pFormControl->GetOriginalBackgroundColor(2)); - } else if (iColorType == COLORTYPE_CMYK) { + } else if (iColorType == CFX_Color::kCMYK) { color = - CFX_Color(COLORTYPE_CMYK, pFormControl->GetOriginalBackgroundColor(0), + CFX_Color(CFX_Color::kCMYK, pFormControl->GetOriginalBackgroundColor(0), pFormControl->GetOriginalBackgroundColor(1), pFormControl->GetOriginalBackgroundColor(2), pFormControl->GetOriginalBackgroundColor(3)); @@ -2227,16 +2227,17 @@ bool Field::strokeColor(CJS_Runtime* pRuntime, pFormControl->GetBorderColor(iColorType); CFX_Color color; - if (iColorType == COLORTYPE_TRANSPARENT) { - color = CFX_Color(COLORTYPE_TRANSPARENT); - } else if (iColorType == COLORTYPE_GRAY) { - color = CFX_Color(COLORTYPE_GRAY, pFormControl->GetOriginalBorderColor(0)); - } else if (iColorType == COLORTYPE_RGB) { - color = CFX_Color(COLORTYPE_RGB, pFormControl->GetOriginalBorderColor(0), + if (iColorType == CFX_Color::kTransparent) { + color = CFX_Color(CFX_Color::kTransparent); + } else if (iColorType == CFX_Color::kGray) { + color = + CFX_Color(CFX_Color::kGray, pFormControl->GetOriginalBorderColor(0)); + } else if (iColorType == CFX_Color::kRGB) { + color = CFX_Color(CFX_Color::kRGB, pFormControl->GetOriginalBorderColor(0), pFormControl->GetOriginalBorderColor(1), pFormControl->GetOriginalBorderColor(2)); - } else if (iColorType == COLORTYPE_CMYK) { - color = CFX_Color(COLORTYPE_CMYK, pFormControl->GetOriginalBorderColor(0), + } else if (iColorType == CFX_Color::kCMYK) { + color = CFX_Color(CFX_Color::kCMYK, pFormControl->GetOriginalBorderColor(0), pFormControl->GetOriginalBorderColor(1), pFormControl->GetOriginalBorderColor(2), pFormControl->GetOriginalBorderColor(3)); @@ -2375,10 +2376,10 @@ bool Field::textColor(CJS_Runtime* pRuntime, std::tie(a, r, g, b) = ArgbDecode(color); CFX_Color crRet = - CFX_Color(COLORTYPE_RGB, r / 255.0f, g / 255.0f, b / 255.0f); + CFX_Color(CFX_Color::kRGB, r / 255.0f, g / 255.0f, b / 255.0f); - if (iColorType == COLORTYPE_TRANSPARENT) - crRet = CFX_Color(COLORTYPE_TRANSPARENT); + if (iColorType == CFX_Color::kTransparent) + crRet = CFX_Color(CFX_Color::kTransparent); color::ConvertPWLColorToArray(pRuntime, crRet, &crArray); vp << crArray; diff --git a/fpdfsdk/javascript/color.cpp b/fpdfsdk/javascript/color.cpp index 574c81a3c0..db860d37df 100644 --- a/fpdfsdk/javascript/color.cpp +++ b/fpdfsdk/javascript/color.cpp @@ -39,18 +39,18 @@ JSMethodSpec CJS_Color::MethodSpecs[] = {{"convert", convert_static}, IMPLEMENT_JS_CLASS(CJS_Color, color) color::color(CJS_Object* pJSObject) : CJS_EmbedObj(pJSObject) { - m_crTransparent = CFX_Color(COLORTYPE_TRANSPARENT); - m_crBlack = CFX_Color(COLORTYPE_GRAY, 0); - m_crWhite = CFX_Color(COLORTYPE_GRAY, 1); - m_crRed = CFX_Color(COLORTYPE_RGB, 1, 0, 0); - m_crGreen = CFX_Color(COLORTYPE_RGB, 0, 1, 0); - m_crBlue = CFX_Color(COLORTYPE_RGB, 0, 0, 1); - m_crCyan = CFX_Color(COLORTYPE_CMYK, 1, 0, 0, 0); - m_crMagenta = CFX_Color(COLORTYPE_CMYK, 0, 1, 0, 0); - m_crYellow = CFX_Color(COLORTYPE_CMYK, 0, 0, 1, 0); - m_crDKGray = CFX_Color(COLORTYPE_GRAY, 0.25); - m_crGray = CFX_Color(COLORTYPE_GRAY, 0.5); - m_crLTGray = CFX_Color(COLORTYPE_GRAY, 0.75); + m_crTransparent = CFX_Color(CFX_Color::kTransparent); + m_crBlack = CFX_Color(CFX_Color::kGray, 0); + m_crWhite = CFX_Color(CFX_Color::kGray, 1); + m_crRed = CFX_Color(CFX_Color::kRGB, 1, 0, 0); + m_crGreen = CFX_Color(CFX_Color::kRGB, 0, 1, 0); + m_crBlue = CFX_Color(CFX_Color::kRGB, 0, 0, 1); + m_crCyan = CFX_Color(CFX_Color::kCMYK, 1, 0, 0, 0); + m_crMagenta = CFX_Color(CFX_Color::kCMYK, 0, 1, 0, 0); + m_crYellow = CFX_Color(CFX_Color::kCMYK, 0, 0, 1, 0); + m_crDKGray = CFX_Color(CFX_Color::kGray, 0.25); + m_crGray = CFX_Color(CFX_Color::kGray, 0.5); + m_crLTGray = CFX_Color(CFX_Color::kGray, 0.75); } color::~color() {} @@ -59,20 +59,20 @@ void color::ConvertPWLColorToArray(CJS_Runtime* pRuntime, const CFX_Color& color, CJS_Array* array) { switch (color.nColorType) { - case COLORTYPE_TRANSPARENT: + case CFX_Color::kTransparent: array->SetElement(pRuntime, 0, CJS_Value(pRuntime, "T")); break; - case COLORTYPE_GRAY: + case CFX_Color::kGray: array->SetElement(pRuntime, 0, CJS_Value(pRuntime, "G")); array->SetElement(pRuntime, 1, CJS_Value(pRuntime, color.fColor1)); break; - case COLORTYPE_RGB: + case CFX_Color::kRGB: array->SetElement(pRuntime, 0, CJS_Value(pRuntime, "RGB")); array->SetElement(pRuntime, 1, CJS_Value(pRuntime, color.fColor1)); array->SetElement(pRuntime, 2, CJS_Value(pRuntime, color.fColor2)); array->SetElement(pRuntime, 3, CJS_Value(pRuntime, color.fColor3)); break; - case COLORTYPE_CMYK: + case CFX_Color::kCMYK: array->SetElement(pRuntime, 0, CJS_Value(pRuntime, "CMYK")); array->SetElement(pRuntime, 1, CJS_Value(pRuntime, color.fColor1)); array->SetElement(pRuntime, 2, CJS_Value(pRuntime, color.fColor2)); @@ -119,14 +119,14 @@ void color::ConvertArrayToPWLColor(CJS_Runtime* pRuntime, } if (sSpace == "T") { - *color = CFX_Color(COLORTYPE_TRANSPARENT); + *color = CFX_Color(CFX_Color::kTransparent); } else if (sSpace == "G") { - *color = CFX_Color(COLORTYPE_GRAY, (float)d1); + *color = CFX_Color(CFX_Color::kGray, (float)d1); } else if (sSpace == "RGB") { - *color = CFX_Color(COLORTYPE_RGB, (float)d1, (float)d2, (float)d3); + *color = CFX_Color(CFX_Color::kRGB, (float)d1, (float)d2, (float)d3); } else if (sSpace == "CMYK") { *color = - CFX_Color(COLORTYPE_CMYK, (float)d1, (float)d2, (float)d3, (float)d4); + CFX_Color(CFX_Color::kCMYK, (float)d1, (float)d2, (float)d3, (float)d4); } } @@ -226,16 +226,16 @@ bool color::convert(CJS_Runtime* pRuntime, ConvertArrayToPWLColor(pRuntime, aSource, &crSource); ByteString sDestSpace = params[1].ToCFXByteString(pRuntime); - int nColorType = COLORTYPE_TRANSPARENT; + int nColorType = CFX_Color::kTransparent; if (sDestSpace == "T") { - nColorType = COLORTYPE_TRANSPARENT; + nColorType = CFX_Color::kTransparent; } else if (sDestSpace == "G") { - nColorType = COLORTYPE_GRAY; + nColorType = CFX_Color::kGray; } else if (sDestSpace == "RGB") { - nColorType = COLORTYPE_RGB; + nColorType = CFX_Color::kRGB; } else if (sDestSpace == "CMYK") { - nColorType = COLORTYPE_CMYK; + nColorType = CFX_Color::kCMYK; } CJS_Array aDest; diff --git a/fpdfsdk/pwl/cpwl_appstream.cpp b/fpdfsdk/pwl/cpwl_appstream.cpp index 7d7f172f2f..27fa09bc31 100644 --- a/fpdfsdk/pwl/cpwl_appstream.cpp +++ b/fpdfsdk/pwl/cpwl_appstream.cpp @@ -104,19 +104,19 @@ ByteString GetColorAppStream(const CFX_Color& color, std::ostringstream sColorStream; switch (color.nColorType) { - case COLORTYPE_RGB: + case CFX_Color::kRGB: sColorStream << color.fColor1 << " " << color.fColor2 << " " << color.fColor3 << " " << (bFillOrStroke ? kSetRGBOperator : kSetRGBStrokedOperator) << "\n"; break; - case COLORTYPE_GRAY: + case CFX_Color::kGray: sColorStream << color.fColor1 << " " << (bFillOrStroke ? kSetGrayOperator : kSetGrayStrokedOperator) << "\n"; break; - case COLORTYPE_CMYK: + case CFX_Color::kCMYK: sColorStream << color.fColor1 << " " << color.fColor2 << " " << color.fColor3 << " " << color.fColor4 << " " << (bFillOrStroke ? kSetCMYKOperator @@ -1055,7 +1055,7 @@ ByteString GetDropButtonAppStream(const CFX_FloatRect& rcBBox) { std::ostringstream sAppStream; { AutoClosedQCommand q(&sAppStream); - sAppStream << GetColorAppStream(CFX_Color(COLORTYPE_RGB, 220.0f / 255.0f, + sAppStream << GetColorAppStream(CFX_Color(CFX_Color::kRGB, 220.0f / 255.0f, 220.0f / 255.0f, 220.0f / 255.0f), true) << rcBBox.left << " " << rcBBox.bottom << " " @@ -1067,9 +1067,9 @@ ByteString GetDropButtonAppStream(const CFX_FloatRect& rcBBox) { { AutoClosedQCommand q(&sAppStream); sAppStream << GetBorderAppStreamInternal( - rcBBox, 2, CFX_Color(COLORTYPE_GRAY, 0), CFX_Color(COLORTYPE_GRAY, 1), - CFX_Color(COLORTYPE_GRAY, 0.5), BorderStyle::BEVELED, - CPWL_Dash(3, 0, 0)); + rcBBox, 2, CFX_Color(CFX_Color::kGray, 0), + CFX_Color(CFX_Color::kGray, 1), CFX_Color(CFX_Color::kGray, 0.5), + BorderStyle::BEVELED, CPWL_Dash(3, 0, 0)); } CFX_PointF ptCenter = CFX_PointF((rcBBox.left + rcBBox.right) / 2, @@ -1164,20 +1164,20 @@ void CPWL_AppStream::SetAsPushButton() { break; case BorderStyle::BEVELED: fBorderWidth *= 2; - crLeftTop = CFX_Color(COLORTYPE_GRAY, 1); + crLeftTop = CFX_Color(CFX_Color::kGray, 1); crRightBottom = crBackground / 2.0f; break; case BorderStyle::INSET: fBorderWidth *= 2; - crLeftTop = CFX_Color(COLORTYPE_GRAY, 0.5); - crRightBottom = CFX_Color(COLORTYPE_GRAY, 0.75); + crLeftTop = CFX_Color(CFX_Color::kGray, 0.5); + crRightBottom = CFX_Color(CFX_Color::kGray, 0.75); break; default: break; } CFX_FloatRect rcClient = rcWindow.GetDeflated(fBorderWidth, fBorderWidth); - CFX_Color crText(COLORTYPE_GRAY, 0); + CFX_Color crText(CFX_Color::kGray, 0); ByteString csNameTag; CPDF_DefaultAppearance da = pControl->GetDefaultAppearance(); if (da.HasColor()) { @@ -1287,8 +1287,8 @@ void CPWL_AppStream::SetAsPushButton() { break; } case BorderStyle::INSET: { - crLeftTop = CFX_Color(COLORTYPE_GRAY, 0); - crRightBottom = CFX_Color(COLORTYPE_GRAY, 1); + crLeftTop = CFX_Color(CFX_Color::kGray, 0); + crRightBottom = CFX_Color(CFX_Color::kGray, 1); break; } default: @@ -1339,13 +1339,13 @@ void CPWL_AppStream::SetAsCheckBox() { break; case BorderStyle::BEVELED: fBorderWidth *= 2; - crLeftTop = CFX_Color(COLORTYPE_GRAY, 1); + crLeftTop = CFX_Color(CFX_Color::kGray, 1); crRightBottom = crBackground / 2.0f; break; case BorderStyle::INSET: fBorderWidth *= 2; - crLeftTop = CFX_Color(COLORTYPE_GRAY, 0.5); - crRightBottom = CFX_Color(COLORTYPE_GRAY, 0.75); + crLeftTop = CFX_Color(CFX_Color::kGray, 0.5); + crRightBottom = CFX_Color(CFX_Color::kGray, 0.75); break; default: break; @@ -1399,8 +1399,8 @@ void CPWL_AppStream::SetAsCheckBox() { break; } case BorderStyle::INSET: { - crLeftTop = CFX_Color(COLORTYPE_GRAY, 0); - crRightBottom = CFX_Color(COLORTYPE_GRAY, 1); + crLeftTop = CFX_Color(CFX_Color::kGray, 0); + crRightBottom = CFX_Color(CFX_Color::kGray, 1); break; } default: @@ -1455,13 +1455,13 @@ void CPWL_AppStream::SetAsRadioButton() { break; case BorderStyle::BEVELED: fBorderWidth *= 2; - crLeftTop = CFX_Color(COLORTYPE_GRAY, 1); + crLeftTop = CFX_Color(CFX_Color::kGray, 1); crRightBottom = crBackground / 2.0f; break; case BorderStyle::INSET: fBorderWidth *= 2; - crLeftTop = CFX_Color(COLORTYPE_GRAY, 0.5); - crRightBottom = CFX_Color(COLORTYPE_GRAY, 0.75); + crLeftTop = CFX_Color(CFX_Color::kGray, 0.5); + crRightBottom = CFX_Color(CFX_Color::kGray, 0.75); break; default: break; @@ -1504,11 +1504,11 @@ void CPWL_AppStream::SetAsRadioButton() { CFX_FloatRect rcCenter = rcWindow.GetCenterSquare().GetDeflated(1.0f, 1.0f); if (nStyle == CheckStyle::kCircle) { if (nBorderStyle == BorderStyle::BEVELED) { - crLeftTop = CFX_Color(COLORTYPE_GRAY, 1); + crLeftTop = CFX_Color(CFX_Color::kGray, 1); crRightBottom = crBackground - 0.25f; } else if (nBorderStyle == BorderStyle::INSET) { - crLeftTop = CFX_Color(COLORTYPE_GRAY, 0.5f); - crRightBottom = CFX_Color(COLORTYPE_GRAY, 0.75f); + crLeftTop = CFX_Color(CFX_Color::kGray, 0.5f); + crRightBottom = CFX_Color(CFX_Color::kGray, 0.75f); } csAP_N_ON = @@ -1532,8 +1532,8 @@ void CPWL_AppStream::SetAsRadioButton() { break; } case BorderStyle::INSET: { - crLeftTop = CFX_Color(COLORTYPE_GRAY, 0); - crRightBottom = CFX_Color(COLORTYPE_GRAY, 1); + crLeftTop = CFX_Color(CFX_Color::kGray, 0); + crRightBottom = CFX_Color(CFX_Color::kGray, 1); break; } default: @@ -1546,11 +1546,11 @@ void CPWL_AppStream::SetAsRadioButton() { CFX_Color crBK = crBackground - 0.25f; if (nBorderStyle == BorderStyle::BEVELED) { crLeftTop = crBackground - 0.25f; - crRightBottom = CFX_Color(COLORTYPE_GRAY, 1); + crRightBottom = CFX_Color(CFX_Color::kGray, 1); crBK = crBackground; } else if (nBorderStyle == BorderStyle::INSET) { - crLeftTop = CFX_Color(COLORTYPE_GRAY, 0); - crRightBottom = CFX_Color(COLORTYPE_GRAY, 1); + crLeftTop = CFX_Color(CFX_Color::kGray, 0); + crRightBottom = CFX_Color(CFX_Color::kGray, 1); } csAP_D_ON = @@ -1695,7 +1695,7 @@ void CPWL_AppStream::SetAsListBox() { CFX_FloatRect(rcClient.left, fy - fItemHeight, rcClient.right, fy); { AutoClosedQCommand q(&sList); - sList << GetColorAppStream(CFX_Color(COLORTYPE_RGB, 0, 51.0f / 255.0f, + sList << GetColorAppStream(CFX_Color(CFX_Color::kRGB, 0, 51.0f / 255.0f, 113.0f / 255.0f), true) << rcItem.left << " " << rcItem.bottom << " " << rcItem.Width() @@ -1704,7 +1704,7 @@ void CPWL_AppStream::SetAsListBox() { } AutoClosedCommand bt(&sList, kTextBeginOperator, kTextEndOperator); - sList << GetColorAppStream(CFX_Color(COLORTYPE_GRAY, 1), true) + sList << GetColorAppStream(CFX_Color(CFX_Color::kGray, 1), true) << GetEditAppStream(pEdit.get(), CFX_PointF(0.0f, fy), true, 0); } else { CFX_Color crText = widget_->GetTextPWLColor(); @@ -1953,7 +1953,7 @@ void CPWL_AppStream::Remove(const ByteString& sAPType) { ByteString CPWL_AppStream::GetBackgroundAppStream() const { CFX_Color crBackground = widget_->GetFillPWLColor(); - if (crBackground.nColorType != COLORTYPE_TRANSPARENT) + if (crBackground.nColorType != CFX_Color::kTransparent) return GetRectFillAppStream(widget_->GetRotatedRect(), crBackground); return ByteString(); @@ -1976,13 +1976,13 @@ ByteString CPWL_AppStream::GetBorderAppStream() const { break; case BorderStyle::BEVELED: fBorderWidth *= 2; - crLeftTop = CFX_Color(COLORTYPE_GRAY, 1); + crLeftTop = CFX_Color(CFX_Color::kGray, 1); crRightBottom = crBackground / 2.0f; break; case BorderStyle::INSET: fBorderWidth *= 2; - crLeftTop = CFX_Color(COLORTYPE_GRAY, 0.5); - crRightBottom = CFX_Color(COLORTYPE_GRAY, 0.75); + crLeftTop = CFX_Color(CFX_Color::kGray, 0.5); + crRightBottom = CFX_Color(CFX_Color::kGray, 0.75); break; default: break; diff --git a/fpdfsdk/pwl/cpwl_combo_box.cpp b/fpdfsdk/pwl/cpwl_combo_box.cpp index 92b01658f2..67d2d88f50 100644 --- a/fpdfsdk/pwl/cpwl_combo_box.cpp +++ b/fpdfsdk/pwl/cpwl_combo_box.cpp @@ -279,7 +279,7 @@ void CPWL_ComboBox::CreateButton(const CreateParams& cp) { CreateParams bcp = cp; bcp.pParentWnd = this; bcp.dwFlags = PWS_VISIBLE | PWS_CHILD | PWS_BORDER | PWS_BACKGROUND; - bcp.sBackgroundColor = CFX_Color(COLORTYPE_RGB, 220.0f / 255.0f, + bcp.sBackgroundColor = CFX_Color(CFX_Color::kRGB, 220.0f / 255.0f, 220.0f / 255.0f, 220.0f / 255.0f); bcp.sBorderColor = PWL_DEFAULT_BLACKCOLOR; bcp.dwBorderWidth = 2; @@ -309,10 +309,10 @@ void CPWL_ComboBox::CreateListBox(const CreateParams& cp) { else lcp.fFontSize = cp.fFontSize; - if (cp.sBorderColor.nColorType == COLORTYPE_TRANSPARENT) + if (cp.sBorderColor.nColorType == CFX_Color::kTransparent) lcp.sBorderColor = PWL_DEFAULT_BLACKCOLOR; - if (cp.sBackgroundColor.nColorType == COLORTYPE_TRANSPARENT) + if (cp.sBackgroundColor.nColorType == CFX_Color::kTransparent) lcp.sBackgroundColor = PWL_DEFAULT_WHITECOLOR; m_pList->Create(lcp); diff --git a/fpdfsdk/pwl/cpwl_scroll_bar.cpp b/fpdfsdk/pwl/cpwl_scroll_bar.cpp index 58a874531f..3ec936730e 100644 --- a/fpdfsdk/pwl/cpwl_scroll_bar.cpp +++ b/fpdfsdk/pwl/cpwl_scroll_bar.cpp @@ -22,7 +22,7 @@ constexpr float kTriangleHalfLength = 2.0f; } // namespace -#define PWL_DEFAULT_HEAVYGRAYCOLOR CFX_Color(COLORTYPE_GRAY, 0.50) +#define PWL_DEFAULT_HEAVYGRAYCOLOR CFX_Color(CFX_Color::kGray, 0.50) PWL_FLOATRANGE::PWL_FLOATRANGE() { Default(); diff --git a/fpdfsdk/pwl/cpwl_wnd.cpp b/fpdfsdk/pwl/cpwl_wnd.cpp index 124065cdf9..ec605a3844 100644 --- a/fpdfsdk/pwl/cpwl_wnd.cpp +++ b/fpdfsdk/pwl/cpwl_wnd.cpp @@ -716,9 +716,9 @@ IPVT_FontMap* CPWL_Wnd::GetFontMap() const { CFX_Color CPWL_Wnd::GetBorderLeftTopColor(BorderStyle nBorderStyle) const { switch (nBorderStyle) { case BorderStyle::BEVELED: - return CFX_Color(COLORTYPE_GRAY, 1); + return CFX_Color(CFX_Color::kGray, 1); case BorderStyle::INSET: - return CFX_Color(COLORTYPE_GRAY, 0.5f); + return CFX_Color(CFX_Color::kGray, 0.5f); default: return CFX_Color(); } @@ -729,7 +729,7 @@ CFX_Color CPWL_Wnd::GetBorderRightBottomColor(BorderStyle nBorderStyle) const { case BorderStyle::BEVELED: return GetBackgroundColor() / 2.0f; case BorderStyle::INSET: - return CFX_Color(COLORTYPE_GRAY, 0.75f); + return CFX_Color(CFX_Color::kGray, 0.75f); default: return CFX_Color(); } diff --git a/fpdfsdk/pwl/cpwl_wnd.h b/fpdfsdk/pwl/cpwl_wnd.h index 38d4ce0918..a9a434dbd1 100644 --- a/fpdfsdk/pwl/cpwl_wnd.h +++ b/fpdfsdk/pwl/cpwl_wnd.h @@ -95,8 +95,8 @@ inline bool operator!=(const CFX_Color& c1, const CFX_Color& c2) { #define PWL_SCROLLBAR_WIDTH 12.0f #define PWL_SCROLLBAR_TRANSPARENCY 150 -#define PWL_DEFAULT_BLACKCOLOR CFX_Color(COLORTYPE_GRAY, 0) -#define PWL_DEFAULT_WHITECOLOR CFX_Color(COLORTYPE_GRAY, 1) +#define PWL_DEFAULT_BLACKCOLOR CFX_Color(CFX_Color::kGray, 0) +#define PWL_DEFAULT_WHITECOLOR CFX_Color(CFX_Color::kGray, 1) class CPWL_Wnd : public CPWL_TimerHandler, public Observable { public: -- cgit v1.2.3