From 655ac8ba9dd5fe781c2358051694311bbf21092a Mon Sep 17 00:00:00 2001 From: Simon Steiner Date: Tue, 15 Dec 2020 13:47:13 +0000 Subject: FOP-2990: Changing ipd doesn't handle table narrowing git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@1884463 13f79535-47bb-0310-9956-ffa450edef68 --- .../main/java/org/apache/fop/layoutmgr/table/TableLayoutManager.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'fop-core/src') diff --git a/fop-core/src/main/java/org/apache/fop/layoutmgr/table/TableLayoutManager.java b/fop-core/src/main/java/org/apache/fop/layoutmgr/table/TableLayoutManager.java index 333419649..453f169e1 100644 --- a/fop-core/src/main/java/org/apache/fop/layoutmgr/table/TableLayoutManager.java +++ b/fop-core/src/main/java/org/apache/fop/layoutmgr/table/TableLayoutManager.java @@ -79,6 +79,7 @@ public class TableLayoutManager extends SpacedBorderedPaddedBlockLayoutManager private Block curBlockArea; private double tableUnit; + private double oldTableUnit; private boolean autoLayout = true; private int halfBorderSeparationBPD; @@ -241,7 +242,8 @@ public class TableLayoutManager extends SpacedBorderedPaddedBlockLayoutManager * for proportional-column-width() */ if (tableUnit == 0.0) { - this.tableUnit = columns.computeTableUnit(this); + tableUnit = columns.computeTableUnit(this); + tableUnit = Math.max(tableUnit, oldTableUnit); } if (!firstVisibleMarkServed) { @@ -531,6 +533,7 @@ public class TableLayoutManager extends SpacedBorderedPaddedBlockLayoutManager public void reset() { super.reset(); curBlockArea = null; + oldTableUnit = tableUnit; tableUnit = 0.0; } -- cgit v1.2.3