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/fwl/cfwl_widget.h | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'xfa/fwl/cfwl_widget.h') diff --git a/xfa/fwl/cfwl_widget.h b/xfa/fwl/cfwl_widget.h index 316e6f5404..11b3569dbd 100644 --- a/xfa/fwl/cfwl_widget.h +++ b/xfa/fwl/cfwl_widget.h @@ -12,6 +12,7 @@ #include "core/fxcrt/cfx_unowned_ptr.h" #include "core/fxcrt/fx_coordinates.h" #include "core/fxcrt/fx_system.h" +#include "xfa/fde/cfde_textout.h" #include "xfa/fwl/cfwl_event.h" #include "xfa/fwl/cfwl_themepart.h" #include "xfa/fwl/cfwl_widgetmgr.h" @@ -132,8 +133,8 @@ class CFWL_Widget : public IFWL_WidgetDelegate { bool bMultiLine); void CalcTextRect(const CFX_WideString& wsText, IFWL_ThemeProvider* pTheme, - uint32_t dwTTOStyles, - int32_t iTTOAlign, + const FDE_TextStyle& dwTTOStyles, + FDE_TextAlignment iTTOAlign, CFX_RectF& rect); void SetGrab(bool bSet); void GetPopupPos(float fMinHeight, -- cgit v1.2.3