You are viewing a plain text version of this content. The canonical link for it is here.
Posted to fop-commits@xmlgraphics.apache.org by je...@apache.org on 2005/04/06 10:36:51 UTC
cvs commit: xml-fop/src/java/org/apache/fop/layoutmgr/table TableLayoutManager.java TableContentLayoutManager.java
jeremias 2005/04/06 01:36:51
Modified: src/java/org/apache/fop/layoutmgr/table Tag:
Temp_KnuthStylePageBreaking TableLayoutManager.java
TableContentLayoutManager.java
Log:
Fixed setting the BPD on the block area for the table (fixes table background and cursor advancement in renderers).
Revision Changes Path
No revision
No revision
1.21.2.2 +1 -0 xml-fop/src/java/org/apache/fop/layoutmgr/table/TableLayoutManager.java
Index: TableLayoutManager.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/layoutmgr/table/TableLayoutManager.java,v
retrieving revision 1.21.2.1
retrieving revision 1.21.2.2
diff -u -r1.21.2.1 -r1.21.2.2
--- TableLayoutManager.java 5 Apr 2005 15:42:44 -0000 1.21.2.1
+++ TableLayoutManager.java 6 Apr 2005 08:36:51 -0000 1.21.2.2
@@ -672,6 +672,7 @@
}
contentLM.addAreas(parentIter, layoutContext);
+ tableHeight += contentLM.getUsedBPD();
// add footer areas
if (footerBreak != null) {
1.1.2.3 +9 -2 xml-fop/src/java/org/apache/fop/layoutmgr/table/Attic/TableContentLayoutManager.java
Index: TableContentLayoutManager.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/layoutmgr/table/Attic/TableContentLayoutManager.java,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- TableContentLayoutManager.java 6 Apr 2005 07:52:28 -0000 1.1.2.2
+++ TableContentLayoutManager.java 6 Apr 2005 08:36:51 -0000 1.1.2.3
@@ -52,6 +52,7 @@
private TableLayoutManager tableLM;
private TableRowIterator trIter;
+ private int usedBPD;
public TableContentLayoutManager(TableLayoutManager parent) {
this.tableLM = parent;
@@ -311,6 +312,7 @@
}
public void addAreas(PositionIterator parentIter, LayoutContext layoutContext) {
+ this.usedBPD = 0;
int colCount = getColumns().getColumnCount();
TableRowIterator.EffRow lastRow = null;
int lastRowHeight = 0;
@@ -333,6 +335,7 @@
if (lastRow != tcpos.row && lastRow != null) {
//yoffset += lastRow.getHeight().opt;
yoffset += lastRowHeight;
+ this.usedBPD += lastRowHeight;
}
lastRow = tcpos.row;
Iterator iter = tcpos.gridUnitParts.iterator();
@@ -397,7 +400,7 @@
layoutContext, lastRow, yoffset, partLength[i], maxLen);
}
}
-
+ this.usedBPD += lastRowHeight; //for last row
}
private int getExplicitCellHeight(PrimaryGridUnit pgu) {
@@ -427,6 +430,10 @@
start, end + 1), layoutContext);
}
+ public int getUsedBPD() {
+ return this.usedBPD;
+ }
+
private class GridUnitPart {
protected PrimaryGridUnit pgu;
---------------------------------------------------------------------
To unsubscribe, e-mail: fop-commits-unsubscribe@xmlgraphics.apache.org
For additional commands, e-mail: fop-commits-help@xmlgraphics.apache.org