diff options
| author | Dan Sinclair <dsinclair@chromium.org> | 2017-08-14 10:26:59 -0400 |
|---|---|---|
| committer | Chromium commit bot <commit-bot@chromium.org> | 2017-08-14 14:50:00 +0000 |
| commit | dff02cee2d2410d81a55c59345fb38b5aac8a457 (patch) | |
| tree | d09dfb18aeb7ae4af4ec96ab0034c6aafbcee883 /xfa/fwl/cfwl_monthcalendar.cpp | |
| parent | aeac95192c106b41c058c8372aa2ec8d0092f60b (diff) | |
| download | pdfium-dff02cee2d2410d81a55c59345fb38b5aac8a457.tar.xz | |
Cleanup FDE_TTO{STYLE|ALIGNMENT} defines.
This CL replaceds FDE_TTOSTYLE defines with a FDE_TextStyle struct which
is used to set the needed flags. The FDE_TTOALIGNMENT defines are
replaced with an enum class and unused members have been removed.
Change-Id: Ib0e2818a82e7f1961de57f8d15703477f8235a03
Reviewed-on: https://pdfium-review.googlesource.com/10530
Reviewed-by: Henrique Nakashima <hnakashima@chromium.org>
Reviewed-by: Tom Sepez <tsepez@chromium.org>
Commit-Queue: dsinclair <dsinclair@chromium.org>
Diffstat (limited to 'xfa/fwl/cfwl_monthcalendar.cpp')
| -rw-r--r-- | xfa/fwl/cfwl_monthcalendar.cpp | 21 |
1 files changed, 12 insertions, 9 deletions
diff --git a/xfa/fwl/cfwl_monthcalendar.cpp b/xfa/fwl/cfwl_monthcalendar.cpp index 8c770e545b..64e6977924 100644 --- a/xfa/fwl/cfwl_monthcalendar.cpp +++ b/xfa/fwl/cfwl_monthcalendar.cpp @@ -247,8 +247,8 @@ void CFWL_MonthCalendar::DrawCaption(CXFA_Graphics* pGraphics, CalcTextSize(textParam.m_wsText, m_pProperties->m_pThemeProvider, false); CalcHeadSize(); textParam.m_rtPart = m_rtHeadText; - textParam.m_dwTTOStyles = FDE_TTOSTYLE_SingleLine; - textParam.m_iTTOAlign = FDE_TTOALIGNMENT_Center; + textParam.m_dwTTOStyles.single_line_ = true; + textParam.m_iTTOAlign = FDE_TextAlignment::kCenter; if (pMatrix) textParam.m_matrix.Concat(*pMatrix); pTheme->DrawText(&textParam); @@ -306,7 +306,9 @@ void CFWL_MonthCalendar::DrawWeek(CXFA_Graphics* pGraphics, params.m_iPart = CFWL_Part::Week; params.m_pGraphics = pGraphics; params.m_dwStates = CFWL_PartState_Normal; - params.m_iTTOAlign = FDE_TTOALIGNMENT_Center; + params.m_iTTOAlign = FDE_TextAlignment::kCenter; + params.m_dwTTOStyles.single_line_ = true; + CFX_RectF rtDayOfWeek; if (pMatrix) params.m_matrix.Concat(*pMatrix); @@ -318,7 +320,6 @@ void CFWL_MonthCalendar::DrawWeek(CXFA_Graphics* pGraphics, params.m_rtPart = rtDayOfWeek; params.m_wsText = GetCapacityForDay(pTheme, params, i); - params.m_dwTTOStyles = FDE_TTOSTYLE_SingleLine; pTheme->DrawText(¶ms); } } @@ -331,14 +332,15 @@ void CFWL_MonthCalendar::DrawToday(CXFA_Graphics* pGraphics, params.m_iPart = CFWL_Part::Today; params.m_pGraphics = pGraphics; params.m_dwStates = CFWL_PartState_Normal; - params.m_iTTOAlign = FDE_TTOALIGNMENT_CenterLeft; + params.m_iTTOAlign = FDE_TextAlignment::kCenterLeft; params.m_wsText = L"Today" + GetTodayText(m_iYear, m_iMonth, m_iDay); m_szToday = CalcTextSize(params.m_wsText, m_pProperties->m_pThemeProvider, false); CalcTodaySize(); params.m_rtPart = m_rtToday; - params.m_dwTTOStyles = FDE_TTOSTYLE_SingleLine; + params.m_dwTTOStyles.single_line_ = true; + if (pMatrix) params.m_matrix.Concat(*pMatrix); pTheme->DrawText(¶ms); @@ -352,7 +354,7 @@ void CFWL_MonthCalendar::DrawDatesIn(CXFA_Graphics* pGraphics, params.m_iPart = CFWL_Part::DatesIn; params.m_pGraphics = pGraphics; params.m_dwStates = CFWL_PartState_Normal; - params.m_iTTOAlign = FDE_TTOALIGNMENT_Center; + params.m_iTTOAlign = FDE_TextAlignment::kCenter; if (pMatrix) params.m_matrix.Concat(*pMatrix); @@ -364,7 +366,8 @@ void CFWL_MonthCalendar::DrawDatesIn(CXFA_Graphics* pGraphics, params.m_dwStates = pDataInfo->dwStates; if (j + 1 == m_iHovered) params.m_dwStates |= CFWL_PartState_Hovered; - params.m_dwTTOStyles = FDE_TTOSTYLE_SingleLine; + + params.m_dwTTOStyles.single_line_ = true; pTheme->DrawText(¶ms); } } @@ -377,7 +380,7 @@ void CFWL_MonthCalendar::DrawDatesOut(CXFA_Graphics* pGraphics, params.m_iPart = CFWL_Part::DatesOut; params.m_pGraphics = pGraphics; params.m_dwStates = CFWL_PartState_Normal; - params.m_iTTOAlign = FDE_TTOALIGNMENT_Center; + params.m_iTTOAlign = FDE_TextAlignment::kCenter; if (pMatrix) params.m_matrix.Concat(*pMatrix); pTheme->DrawText(¶ms); |