oox smartart, linear layout: correctly scale spacings wrt constraints and rules

When constraints request a width which is larger than 100%, we scale
down. Then rules decide which children should be scaled down and which
ones stay as-is.

This commit adjusts the size of children which have no rule, but their
size has a constraint that they're a fraction of a scaled down child.

Change-Id: I0a007d82f49f18951215afb1bfe8c0f1328ecd41
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/99875
Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
Tested-by: Jenkins
This commit is contained in:
Miklos Vajna 2020-07-31 15:59:10 +02:00
parent f14103af30
commit 91f0f7e5e0
3 changed files with 48 additions and 8 deletions

View file

@ -905,7 +905,7 @@ void AlgAtom::layoutShape(const ShapePtr& rShape, const std::vector<Constraint>&
const sal_Int32 nIncX = nDir==XML_fromL ? 1 : (nDir==XML_fromR ? -1 : 0);
const sal_Int32 nIncY = nDir==XML_fromT ? 1 : (nDir==XML_fromB ? -1 : 0);
sal_Int32 nCount = rShape->getChildren().size();
double fCount = rShape->getChildren().size();
sal_Int32 nConnectorAngle = 0;
switch (nDir)
{
@ -952,18 +952,50 @@ void AlgAtom::layoutShape(const ShapePtr& rShape, const std::vector<Constraint>&
if (!aChildrenToShrink.empty())
{
// Have scaling info from rules: then only count scaled children.
// Also count children which are a fraction of a scaled child.
std::set<OUString> aChildrenToShrinkDeps;
for (auto& aCurrShape : rShape->getChildren())
{
if (aChildrenToShrink.find(aCurrShape->getInternalName())
== aChildrenToShrink.end())
{
if (nCount > 1)
if (fCount > 1.0)
{
--nCount;
fCount -= 1.0;
for (const auto& rConstraint : rConstraints)
{
if (rConstraint.msForName != aCurrShape->getInternalName())
{
continue;
}
if (aChildrenToShrink.find(rConstraint.msRefForName) == aChildrenToShrink.end())
{
continue;
}
if ((nDir == XML_fromL || nDir == XML_fromR) && rConstraint.mnType != XML_w)
{
continue;
}
if ((nDir == XML_fromT || nDir == XML_fromB) && rConstraint.mnType != XML_h)
{
continue;
}
// At this point we have a child with a size which is a factor of an
// other child which will be scaled.
fCount += rConstraint.mfFactor;
aChildrenToShrinkDeps.insert(aCurrShape->getInternalName());
break;
}
}
}
}
aChildrenToShrink.insert(aChildrenToShrinkDeps.begin(), aChildrenToShrinkDeps.end());
// No manual spacing: spacings are children as well.
aSpaceSize = awt::Size();
}
@ -978,13 +1010,13 @@ void AlgAtom::layoutShape(const ShapePtr& rShape, const std::vector<Constraint>&
&& aChild->getChildren().empty();
}),
rShape->getChildren().end());
nCount = rShape->getChildren().size();
fCount = rShape->getChildren().size();
}
awt::Size aChildSize = rShape->getSize();
if (nDir == XML_fromL || nDir == XML_fromR)
aChildSize.Width /= nCount;
aChildSize.Width /= fCount;
else if (nDir == XML_fromT || nDir == XML_fromB)
aChildSize.Height /= nCount;
aChildSize.Height /= fCount;
awt::Point aCurrPos(0, 0);
if (nIncX == -1)
@ -1008,8 +1040,8 @@ void AlgAtom::layoutShape(const ShapePtr& rShape, const std::vector<Constraint>&
aTotalSize.Height += aSize.Height;
}
aTotalSize.Width += (nCount-1) * aSpaceSize.Width;
aTotalSize.Height += (nCount-1) * aSpaceSize.Height;
aTotalSize.Width += (fCount-1) * aSpaceSize.Width;
aTotalSize.Height += (fCount-1) * aSpaceSize.Height;
double fWidthScale = 1.0;
double fHeightScale = 1.0;

View file

@ -1541,6 +1541,14 @@ void SdImportTestSmartArt::testLinearRule()
// i.e. the width of the background arrow was too small.
CPPUNIT_ASSERT_GREATER(static_cast<sal_Int32>(17500), xShape->getSize().Width);
// Without the accompanying fix in place, this test would have failed with:
// - Expected: 3160
// - Actual : 8770
// i.e. there was unexpected spacing on the left of the arrow.
sal_Int32 nGroupLeft = xGroup->getPosition().X;
sal_Int32 nArrowLeft = xShape->getPosition().X;
CPPUNIT_ASSERT_EQUAL(nGroupLeft, nArrowLeft);
xDocShRef->DoClose();
}