From dff02cee2d2410d81a55c59345fb38b5aac8a457 Mon Sep 17 00:00:00 2001 From: Dan Sinclair Date: Mon, 14 Aug 2017 10:26:59 -0400 Subject: 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 Reviewed-by: Tom Sepez Commit-Queue: dsinclair --- xfa/fxfa/cxfa_widgetacc.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'xfa/fxfa') diff --git a/xfa/fxfa/cxfa_widgetacc.cpp b/xfa/fxfa/cxfa_widgetacc.cpp index 0ed941f6bd..92d00e5ba9 100644 --- a/xfa/fxfa/cxfa_widgetacc.cpp +++ b/xfa/fxfa/cxfa_widgetacc.cpp @@ -841,9 +841,11 @@ void CXFA_WidgetAcc::CalculateTextContentSize(CFX_SizeF& size) { pTextOut->SetFontSize(fFontSize); pTextOut->SetLineBreakTolerance(fFontSize * 0.2f); pTextOut->SetLineSpace(GetLineHeight()); - uint32_t dwStyles = FDE_TTOSTYLE_LastLineHeight; + + FDE_TextStyle dwStyles; + dwStyles.last_line_height_ = true; if (GetUIType() == XFA_Element::TextEdit && IsMultiLine()) - dwStyles |= FDE_TTOSTYLE_LineWrap; + dwStyles.line_wrap_ = true; pTextOut->SetStyles(dwStyles); } -- cgit v1.2.3