| Index: xfa/fwl/theme/cfwl_datetimepickedtp.cpp
|
| diff --git a/xfa/fwl/theme/cfwl_datetimepickedtp.cpp b/xfa/fwl/theme/cfwl_datetimepickedtp.cpp
|
| index 4e1d39a15afc2745b5994dca9b16ea7e61a70a6a..899180faa0f97dd91aab8b2c204a11e8a6bdc649 100644
|
| --- a/xfa/fwl/theme/cfwl_datetimepickedtp.cpp
|
| +++ b/xfa/fwl/theme/cfwl_datetimepickedtp.cpp
|
| @@ -42,7 +42,7 @@ FX_BOOL CFWL_DateTimePickerTP::DrawBackground(CFWL_ThemeBackground* pParams) {
|
| }
|
| return TRUE;
|
| }
|
| -#ifdef THEME_XPSimilar
|
| +
|
| void CFWL_DateTimePickerTP::DrawDropDownButton(CFWL_ThemeBackground* pParams,
|
| CFX_Matrix* pMatrix) {
|
| uint32_t dwStates = pParams->m_dwStates;
|
| @@ -70,46 +70,7 @@ void CFWL_DateTimePickerTP::DrawDropDownButton(CFWL_ThemeBackground* pParams,
|
| DrawArrowBtn(pParams->m_pGraphics, &pParams->m_rtPart,
|
| FWLTHEME_DIRECTION_Down, eState, pMatrix);
|
| }
|
| -#else
|
| -void CFWL_DateTimePickerTP::DrawDropDownButton(CFWL_ThemeBackground* pParams,
|
| - CFX_Matrix* pMatrix) {
|
| - FX_BOOL bPressed = ((pParams->m_dwStates & FWL_PARTSTATE_DTP_Pressed) ==
|
| - FWL_PARTSTATE_DTP_Pressed);
|
| - FX_FLOAT fWidth = bPressed ? 1.0f : 2.0f;
|
| - FWLTHEME_EDGE eType = bPressed ? FWLTHEME_EDGE_Flat : FWLTHEME_EDGE_Raised;
|
| - Draw3DRect(pParams->m_pGraphics, eType, fWidth, &pParams->m_rtPart,
|
| - FWLTHEME_COLOR_EDGELT1, FWLTHEME_COLOR_EDGELT2,
|
| - FWLTHEME_COLOR_EDGERB1, FWLTHEME_COLOR_EDGERB2, pMatrix);
|
| - CFX_Path path;
|
| - path.Create();
|
| - path.AddRectangle(pParams->m_rtPart.left + fWidth,
|
| - pParams->m_rtPart.top + fWidth,
|
| - pParams->m_rtPart.width - 2 * fWidth,
|
| - pParams->m_rtPart.height - 2 * fWidth);
|
| - pParams->m_pGraphics->SaveGraphState();
|
| - CFX_Color crFill(FWLTHEME_COLOR_Background);
|
| - pParams->m_pGraphics->SetFillColor(&crFill);
|
| - pParams->m_pGraphics->FillPath(&path, FXFILL_WINDING, pMatrix);
|
| - pParams->m_pGraphics->RestoreGraphState();
|
| - FX_ARGB argbFill = ArgbEncode(255, 77, 97, 133);
|
| - switch (pParams->m_dwStates & 0x03) {
|
| - case FWL_PARTSTATE_DTP_Normal: {
|
| - }
|
| - case FWL_PARTSTATE_DTP_Hovered: {
|
| - }
|
| - case FWL_PARTSTATE_DTP_Pressed: {
|
| - argbFill = 0xFF000000;
|
| - break;
|
| - }
|
| - case FWL_PARTSTATE_DTP_Disabled: {
|
| - argbFill = 0xFFF0F0F0;
|
| - break;
|
| - }
|
| - }
|
| - DrawArrow(pParams->m_pGraphics, &pParams->m_rtPart, FWLTHEME_DIRECTION_Down,
|
| - argbFill, bPressed, pMatrix);
|
| -}
|
| -#endif
|
| +
|
| void CFWL_DateTimePickerTP::initThemeData() {
|
| uint32_t* pData = (uint32_t*)&m_pThemeData->BoxBkColor;
|
| *pData++ = 0;
|
|
|