keiron 2002/11/05 03:19:52
Modified: src/org/apache/fop/layoutmgr/table Cell.java Row.java
Log:
set all cells to the row height
Revision Changes Path
1.4 +13 -1 xml-fop/src/org/apache/fop/layoutmgr/table/Cell.java
Index: Cell.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/layoutmgr/table/Cell.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- Cell.java 1 Nov 2002 10:49:34 -0000 1.3
+++ Cell.java 5 Nov 2002 11:19:52 -0000 1.4
@@ -41,6 +41,7 @@
private int xoffset;
private int yoffset;
private int cellIPD;
+ private int height;
/**
* Create a new Cell layout manager.
@@ -137,6 +138,15 @@
}
/**
+ * Set the row height that contains this cell.
+ *
+ * @param h the height of the row
+ */
+ public void setRowHeight(int h) {
+ height = h;
+ }
+
+ /**
* Add the areas for the break points.
* The cell contains block stacking layout managers
* that add block areas.
@@ -170,6 +180,8 @@
if(backgroundProps != null) {
addBackground(curBlockArea, backgroundProps);
}
+
+ curBlockArea.setHeight(height);
flush();
1.4 +8 -2 xml-fop/src/org/apache/fop/layoutmgr/table/Row.java
Index: Row.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/layoutmgr/table/Row.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- Row.java 3 Nov 2002 16:29:58 -0000 1.3
+++ Row.java 5 Nov 2002 11:19:52 -0000 1.4
@@ -60,6 +60,11 @@
super(fobj);
}
+ /**
+ * Initialize properties for this layout manager.
+ *
+ * @param propMgr the property manager for the fo
+ */
protected void initProperties(PropertyManager propMgr) {
borderProps = propMgr.getBorderAndPadding();
backgroundProps = propMgr.getBackgroundProps();
@@ -167,7 +172,7 @@
if (stackSize.min > min) {
min = stackSize.min;
}
- // the optimum is the minimum of all optimums
+ // the optimum is the maximum of all optimums
if (stackSize.opt > opt) {
opt = stackSize.opt;
}
@@ -238,6 +243,7 @@
while ((childLM = (Cell)breakPosIter.getNextChildLM()) != null) {
childLM.setXOffset(xoffset);
childLM.setYOffset(yoffset);
+ childLM.setRowHeight(rowHeight);
childLM.addAreas(breakPosIter, lc);
}
xoffset += col.getWidth();
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
