Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(270)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: xfa/fwl/theme/cfwl_checkboxtp.cpp

Issue 2521683002: Update SetThemeColor and SetThemeData (Closed)
Patch Set: Review cleanups Created 4 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « xfa/fwl/theme/cfwl_checkboxtp.h ('k') | xfa/fwl/theme/cfwl_monthcalendartp.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: xfa/fwl/theme/cfwl_checkboxtp.cpp
diff --git a/xfa/fwl/theme/cfwl_checkboxtp.cpp b/xfa/fwl/theme/cfwl_checkboxtp.cpp
index 731790c616a57df05ce00446bc7f151bc6b38274..32c390a5dff69e4dc3cbfab7f62425374088b067 100644
--- a/xfa/fwl/theme/cfwl_checkboxtp.cpp
+++ b/xfa/fwl/theme/cfwl_checkboxtp.cpp
@@ -27,7 +27,7 @@ const int kSignPath = 100;
#define CHECKBOX_COLOR_BOXRB2 (ArgbEncode(255, 255, 255, 255))
CFWL_CheckBoxTP::CFWL_CheckBoxTP() : m_pThemeData(new CKBThemeData) {
- SetThemeData(0);
+ SetThemeData();
}
CFWL_CheckBoxTP::~CFWL_CheckBoxTP() {
@@ -179,73 +179,42 @@ void CFWL_CheckBoxTP::DrawSignStar(CFX_Graphics* pGraphics,
pGraphics->RestoreGraphState();
}
-void CFWL_CheckBoxTP::SetThemeData(uint32_t dwID) {
+void CFWL_CheckBoxTP::SetThemeData() {
uint32_t* pData = (uint32_t*)&m_pThemeData->clrBoxBk;
- if (dwID) {
- *pData++ = 0, *pData++ = 0, *pData++ = ArgbEncode(255, 220, 220, 215),
- *pData++ = ArgbEncode(255, 255, 255, 255),
- *pData++ = ArgbEncode(255, 255, 240, 207),
- *pData++ = ArgbEncode(255, 248, 179, 48),
- *pData++ = ArgbEncode(255, 176, 176, 167),
- *pData++ = ArgbEncode(255, 241, 239, 239),
- *pData++ = ArgbEncode(255, 255, 255, 255),
- *pData++ = ArgbEncode(255, 255, 255, 255),
- *pData++ = ArgbEncode(255, 220, 220, 215),
- *pData++ = ArgbEncode(255, 255, 255, 255),
- *pData++ = ArgbEncode(255, 255, 240, 207),
- *pData++ = ArgbEncode(255, 248, 179, 48),
- *pData++ = ArgbEncode(255, 176, 176, 167),
- *pData++ = ArgbEncode(255, 241, 239, 239),
- *pData++ = ArgbEncode(255, 255, 255, 255),
- *pData++ = ArgbEncode(255, 255, 255, 255),
- *pData++ = ArgbEncode(255, 220, 220, 215),
- *pData++ = ArgbEncode(255, 255, 255, 255),
- *pData++ = ArgbEncode(255, 255, 240, 207),
- *pData++ = ArgbEncode(255, 248, 179, 48),
- *pData++ = ArgbEncode(255, 176, 176, 167),
- *pData++ = ArgbEncode(255, 241, 239, 239),
- *pData++ = ArgbEncode(255, 255, 255, 255),
- *pData++ = ArgbEncode(255, 255, 255, 255);
- m_pThemeData->clrSignBorderNormal = ArgbEncode(255, 154, 167, 114);
- m_pThemeData->clrSignBorderDisable = ArgbEncode(255, 202, 200, 187);
- m_pThemeData->clrSignCheck = ArgbEncode(255, 164, 180, 138);
- m_pThemeData->clrSignNeutral = ArgbEncode(2255, 28, 134, 26);
- m_pThemeData->clrSignNeutralNormal = ArgbEncode(255, 114, 192, 113);
- m_pThemeData->clrSignNeutralHover = ArgbEncode(255, 33, 161, 33);
- m_pThemeData->clrSignNeutralPressed = ArgbEncode(255, 28, 134, 26);
- } else {
- *pData++ = 0, *pData++ = 0, *pData++ = ArgbEncode(255, 220, 220, 215),
- *pData++ = ArgbEncode(255, 255, 255, 255),
- *pData++ = ArgbEncode(255, 255, 240, 207),
- *pData++ = ArgbEncode(255, 248, 179, 48),
- *pData++ = ArgbEncode(255, 176, 176, 167),
- *pData++ = ArgbEncode(255, 241, 239, 239),
- *pData++ = ArgbEncode(255, 255, 255, 255),
- *pData++ = ArgbEncode(255, 255, 255, 255),
- *pData++ = ArgbEncode(255, 220, 220, 215),
- *pData++ = ArgbEncode(255, 255, 255, 255),
- *pData++ = ArgbEncode(255, 255, 240, 207),
- *pData++ = ArgbEncode(255, 248, 179, 48),
- *pData++ = ArgbEncode(255, 176, 176, 167),
- *pData++ = ArgbEncode(255, 241, 239, 239),
- *pData++ = ArgbEncode(255, 255, 255, 255),
- *pData++ = ArgbEncode(255, 255, 255, 255),
- *pData++ = ArgbEncode(255, 220, 220, 215),
- *pData++ = ArgbEncode(255, 255, 255, 255),
- *pData++ = ArgbEncode(255, 255, 240, 207),
- *pData++ = ArgbEncode(255, 248, 179, 48),
- *pData++ = ArgbEncode(255, 176, 176, 167),
- *pData++ = ArgbEncode(255, 241, 239, 239),
- *pData++ = ArgbEncode(255, 255, 255, 255),
- *pData++ = ArgbEncode(255, 255, 255, 255);
- m_pThemeData->clrSignBorderNormal = ArgbEncode(255, 28, 81, 128);
- m_pThemeData->clrSignBorderDisable = ArgbEncode(255, 202, 200, 187);
- m_pThemeData->clrSignCheck = ArgbEncode(255, 28, 81, 128);
- m_pThemeData->clrSignNeutral = ArgbEncode(255, 28, 134, 26);
- m_pThemeData->clrSignNeutralNormal = ArgbEncode(255, 114, 192, 113);
- m_pThemeData->clrSignNeutralHover = ArgbEncode(255, 33, 161, 33);
- m_pThemeData->clrSignNeutralPressed = ArgbEncode(255, 28, 134, 26);
- }
+
+ *pData++ = 0;
+ *pData++ = 0;
+ *pData++ = ArgbEncode(255, 220, 220, 215),
+ *pData++ = ArgbEncode(255, 255, 255, 255),
+ *pData++ = ArgbEncode(255, 255, 240, 207),
+ *pData++ = ArgbEncode(255, 248, 179, 48),
+ *pData++ = ArgbEncode(255, 176, 176, 167),
+ *pData++ = ArgbEncode(255, 241, 239, 239),
+ *pData++ = ArgbEncode(255, 255, 255, 255),
+ *pData++ = ArgbEncode(255, 255, 255, 255),
+ *pData++ = ArgbEncode(255, 220, 220, 215),
+ *pData++ = ArgbEncode(255, 255, 255, 255),
+ *pData++ = ArgbEncode(255, 255, 240, 207),
+ *pData++ = ArgbEncode(255, 248, 179, 48),
+ *pData++ = ArgbEncode(255, 176, 176, 167),
+ *pData++ = ArgbEncode(255, 241, 239, 239),
+ *pData++ = ArgbEncode(255, 255, 255, 255),
+ *pData++ = ArgbEncode(255, 255, 255, 255),
+ *pData++ = ArgbEncode(255, 220, 220, 215),
+ *pData++ = ArgbEncode(255, 255, 255, 255),
+ *pData++ = ArgbEncode(255, 255, 240, 207),
+ *pData++ = ArgbEncode(255, 248, 179, 48),
+ *pData++ = ArgbEncode(255, 176, 176, 167),
+ *pData++ = ArgbEncode(255, 241, 239, 239),
+ *pData++ = ArgbEncode(255, 255, 255, 255),
+ *pData++ = ArgbEncode(255, 255, 255, 255);
+ m_pThemeData->clrSignBorderNormal = ArgbEncode(255, 28, 81, 128);
+ m_pThemeData->clrSignBorderDisable = ArgbEncode(255, 202, 200, 187);
+ m_pThemeData->clrSignCheck = ArgbEncode(255, 28, 81, 128);
+ m_pThemeData->clrSignNeutral = ArgbEncode(255, 28, 134, 26);
+ m_pThemeData->clrSignNeutralNormal = ArgbEncode(255, 114, 192, 113);
+ m_pThemeData->clrSignNeutralHover = ArgbEncode(255, 33, 161, 33);
+ m_pThemeData->clrSignNeutralPressed = ArgbEncode(255, 28, 134, 26);
}
void CFWL_CheckBoxTP::InitCheckPath(FX_FLOAT fCheckLen) {
« no previous file with comments | « xfa/fwl/theme/cfwl_checkboxtp.h ('k') | xfa/fwl/theme/cfwl_monthcalendartp.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698