summaryrefslogtreecommitdiff
path: root/xfa/fxfa/cxfa_fftext.cpp
diff options
context:
space:
mode:
authorDan Sinclair <dsinclair@chromium.org>2017-11-21 16:25:01 +0000
committerChromium commit bot <commit-bot@chromium.org>2017-11-21 16:25:01 +0000
commite6e262844037dfc66e5118bcedf1c84d57f78706 (patch)
tree5e939e1be2b819b49e2ac050412de2179e123cc6 /xfa/fxfa/cxfa_fftext.cpp
parent120c19b6a19377c341658c342c4351eccbb59741 (diff)
downloadpdfium-e6e262844037dfc66e5118bcedf1c84d57f78706.tar.xz
Add CXFA_MarginData::Get*Inset helpers
This CL adds Get*Inset helpers to CXFA_MarginData which just return a default value of 0 if the Try*Inset method fails. Change-Id: I03b00b7a371c39e521f95952e965b4a3ef71d517 Reviewed-on: https://pdfium-review.googlesource.com/18870 Reviewed-by: Henrique Nakashima <hnakashima@chromium.org> Commit-Queue: dsinclair <dsinclair@chromium.org>
Diffstat (limited to 'xfa/fxfa/cxfa_fftext.cpp')
-rw-r--r--xfa/fxfa/cxfa_fftext.cpp24
1 files changed, 8 insertions, 16 deletions
diff --git a/xfa/fxfa/cxfa_fftext.cpp b/xfa/fxfa/cxfa_fftext.cpp
index 6242b8ec17..606c22e130 100644
--- a/xfa/fxfa/cxfa_fftext.cpp
+++ b/xfa/fxfa/cxfa_fftext.cpp
@@ -46,18 +46,15 @@ void CXFA_FFText::RenderWidget(CXFA_Graphics* pGS,
if (!pItem->GetPrev() && !pItem->GetNext()) {
XFA_RectWidthoutMargin(rtText, marginData);
} else {
- float fLeftInset = 0;
- float fRightInset = 0;
float fTopInset = 0;
float fBottomInset = 0;
- marginData.TryLeftInset(fLeftInset);
- marginData.TryRightInset(fRightInset);
if (!pItem->GetPrev())
- marginData.TryTopInset(fTopInset);
+ fTopInset = marginData.GetTopInset();
else if (!pItem->GetNext())
- marginData.TryBottomInset(fBottomInset);
+ fBottomInset = marginData.GetBottomInset();
- rtText.Deflate(fLeftInset, fTopInset, fRightInset, fBottomInset);
+ rtText.Deflate(marginData.GetLeftInset(), fTopInset,
+ marginData.GetRightInset(), fBottomInset);
}
}
@@ -90,15 +87,10 @@ bool CXFA_FFText::PerformLayout() {
CFX_RectF rtText = pItem->GetRect(false);
CXFA_MarginData marginData = m_pDataAcc->GetMarginData();
if (marginData.HasValidNode()) {
- if (!pItem->GetPrev()) {
- float fTopInset = 0;
- marginData.TryTopInset(fTopInset);
- rtText.height -= fTopInset;
- } else if (!pItem->GetNext()) {
- float fBottomInset = 0;
- marginData.TryBottomInset(fBottomInset);
- rtText.height -= fBottomInset;
- }
+ if (!pItem->GetPrev())
+ rtText.height -= marginData.GetTopInset();
+ else if (!pItem->GetNext())
+ rtText.height -= marginData.GetBottomInset();
}
pTextLayout->ItemBlocks(rtText, pItem->GetIndex());
pItem = pItem->GetNext();