fenix
/
PDF4QT
mirror of https://github.com/JakubMelka/PDF4QT.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

XFA: fix layout of items directly under a page

This commit is contained in:
Jakub Melka 2021-12-24 14:50:52 +01:00
parent e301d70fe2
commit f53b9f2988
1 changed files with 41 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
Pdf4QtLib/sources/pdfxfaengine.cpp
View File

@ -9895,7 +9895,7 @@ private:
Q_ASSERT(false); // These should not be lay-out
break;
case xfa::XFA_BaseNode::PRESENCE::Invisible:
presence = xfa::XFA_BaseNode::PRESENCE::Invisible;
this->presence = xfa::XFA_BaseNode::PRESENCE::Invisible;
break;
default:
@ -9951,8 +9951,8 @@ private:
/// Page index (or, more precisely, index of content area)
size_t pageIndex = 0;
/// Add content area offset?
bool addContentAreaOffset = true;
/// Are we performing layout into content area (not to a page)?
bool isContentAreaLayout = true;
/// Nominal extent of the parent node (where items are children
/// of this node).
@ -10073,6 +10073,7 @@ private:
std::vector<PageInfo> m_pages;
std::vector<Layout> m_layout;
std::map<const xfa::XFA_pageArea*, std::vector<Layout>> m_pageLayouts;
std::vector<xfa::XFA_ParagraphSettings> m_paragraphSettings;
std::stack<LayoutParameters> m_layoutParameters;
size_t m_currentPageIndex = 0;
@ -10677,7 +10678,7 @@ void PDFXFALayoutEngine::performLayout(PDFXFAEngineImpl* engine, const xfa::XFA_
for (Layout& layout : m_layout)
{
if (layout.addContentAreaOffset)
if (layout.isContentAreaLayout)
{
const PageInfo& pageInfo = m_pages.at(layout.pageIndex);
layout.translate(pageInfo.contentBox.left(), pageInfo.contentBox.top());
@ -10693,6 +10694,31 @@ void PDFXFALayoutEngine::performLayout(PDFXFAEngineImpl* engine, const xfa::XFA_
{
PDFXFAEngineImpl::LayoutItems layoutItems;
const PageInfo& pageInfo = m_pages.at(layoutSinglePage.first);
pageSizes.push_back(pageInfo.mediaBox.size());
for (const Layout& layout : m_pageLayouts[pageInfo.pageArea])
{
for (const LayoutItem& layoutItem : layout.items)
{
// Invisible item?
if (layoutItem.presence != xfa::XFA_BaseNode::PRESENCE::Visible)
{
continue;
}
PDFXFAEngineImpl::LayoutItem engineLayoutItem;
engineLayoutItem.nominalExtent = layoutItem.nominalExtent;
engineLayoutItem.draw = layoutItem.draw;
engineLayoutItem.field = layoutItem.field;
engineLayoutItem.subform = layoutItem.subform;
engineLayoutItem.exclGroup = layoutItem.exclGroup;
engineLayoutItem.paragraphSettingsIndex = layoutItem.paragraphSettingsIndex;
engineLayoutItem.captionParagraphSettingsIndex = layoutItem.captionParagraphSettingsIndex;
layoutItems.emplace_back(std::move(engineLayoutItem));
}
}
for (const Layout& layout : layoutSinglePage.second)
{
for (const LayoutItem& layoutItem : layout.items)
@ -10715,9 +10741,6 @@ void PDFXFALayoutEngine::performLayout(PDFXFAEngineImpl* engine, const xfa::XFA_
}
}
const PageInfo& pageInfo = m_pages.at(layoutSinglePage.first);
pageSizes.push_back(pageInfo.mediaBox.size());
engine->setLayoutItems(pageIndex++, std::move(layoutItems));
}
@ -10806,14 +10829,18 @@ void PDFXFALayoutEngine::visit(const xfa::XFA_pageArea* node)
++pageInfo.contentBoxIndex;
}
xfa::XFA_AbstractNode::acceptOrdered(this, node->getArea(), node->getDraw(), node->getExclGroup(), node->getField(), node->getSubform());
LayoutParameters& layoutParameters = getLayoutParameters();
for (Layout& layout : layoutParameters.layout)
{
layout.addContentAreaOffset = false;
}
}
xfa::XFA_AbstractNode::acceptOrdered(this, node->getArea(), node->getDraw(), node->getExclGroup(), node->getField(), node->getSubform());
LayoutParameters& layoutParameters = getLayoutParameters();
for (Layout& layout : layoutParameters.layout)
{
layout.isContentAreaLayout = false;
}
m_pageLayouts[node] = std::move(layoutParameters.layout);
layoutParameters.layout.clear();
}
void PDFXFALayoutEngine::visit(const xfa::XFA_pageSet* node)