summaryrefslogtreecommitdiff
path: root/xfa/fwl/cfwl_widget.h
diff options
context:
space:
mode:
authorDan Sinclair <dsinclair@chromium.org>2017-08-14 10:26:59 -0400
committerChromium commit bot <commit-bot@chromium.org>2017-08-14 14:50:00 +0000
commitdff02cee2d2410d81a55c59345fb38b5aac8a457 (patch)
treed09dfb18aeb7ae4af4ec96ab0034c6aafbcee883 /xfa/fwl/cfwl_widget.h
parentaeac95192c106b41c058c8372aa2ec8d0092f60b (diff)
downloadpdfium-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_widget.h')
-rw-r--r--xfa/fwl/cfwl_widget.h5
1 files changed, 3 insertions, 2 deletions
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,