jeremias 2005/01/24 01:16:45
Modified: src/java/org/apache/fop/layoutmgr
BlockContainerLayoutManager.java
Log:
Setting IPD and BPD before adding background traits
Revision Changes Path
1.32 +7 -6
xml-fop/src/java/org/apache/fop/layoutmgr/BlockContainerLayoutManager.java
Index: BlockContainerLayoutManager.java
===================================================================
RCS file:
/home/cvs/xml-fop/src/java/org/apache/fop/layoutmgr/BlockContainerLayoutManager.java,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- BlockContainerLayoutManager.java 18 Jan 2005 07:00:14 -0000 1.31
+++ BlockContainerLayoutManager.java 24 Jan 2005 09:16:45 -0000 1.32
@@ -472,18 +472,19 @@
if (referenceArea == null) {
viewportBlockArea = new BlockViewport();
viewportBlockArea.addTrait(Trait.IS_VIEWPORT_AREA, Boolean.TRUE);
- TraitSetter.addBorders(viewportBlockArea,
fobj.getCommonBorderPaddingBackground());
- TraitSetter.addBackground(viewportBlockArea,
fobj.getCommonBorderPaddingBackground());
- TraitSetter.addMargins(viewportBlockArea, null,
- fobj.getCommonBorderPaddingBackground(),
- fobj.getCommonMarginBlock());
-
viewportBlockArea.setIPD(vpContentIPD);
if (autoHeight) {
viewportBlockArea.setBPD(0);
} else {
viewportBlockArea.setBPD(vpContentBPD);
}
+
+ TraitSetter.addBorders(viewportBlockArea,
fobj.getCommonBorderPaddingBackground());
+ TraitSetter.addBackground(viewportBlockArea,
fobj.getCommonBorderPaddingBackground());
+ TraitSetter.addMargins(viewportBlockArea, null,
+ fobj.getCommonBorderPaddingBackground(),
+ fobj.getCommonMarginBlock());
+
viewportBlockArea.setCTM(absoluteCTM);
viewportBlockArea.setClip(clip);
if (getSpaceBefore() != 0) {
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
