diff options
author | Jeremias Maerki <jeremias@apache.org> | 2005-08-29 14:22:21 +0000 |
---|---|---|
committer | Jeremias Maerki <jeremias@apache.org> | 2005-08-29 14:22:21 +0000 |
commit | 0acbef0d3f65b1f2404cb2f507a7e2171f04726b (patch) | |
tree | ee193490e9392349265a985aa65b693b667494bd | |
parent | aa4d68d3f3d33ec409e6d1fbb166fc0402d4de4b (diff) | |
download | xmlgraphics-fop-0acbef0d3f65b1f2404cb2f507a7e2171f04726b.tar.gz xmlgraphics-fop-0acbef0d3f65b1f2404cb2f507a7e2171f04726b.zip |
Moved renderInlineBlockParent() up to the superclass. Fixes border and background painting for inline block parents in PostScript.
git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@264147 13f79535-47bb-0310-9956-ffa450edef68
-rw-r--r-- | src/java/org/apache/fop/render/AbstractPathOrientedRenderer.java | 12 | ||||
-rw-r--r-- | src/java/org/apache/fop/render/pdf/PDFRenderer.java | 12 |
2 files changed, 12 insertions, 12 deletions
diff --git a/src/java/org/apache/fop/render/AbstractPathOrientedRenderer.java b/src/java/org/apache/fop/render/AbstractPathOrientedRenderer.java index d22adb9cb..398ba939f 100644 --- a/src/java/org/apache/fop/render/AbstractPathOrientedRenderer.java +++ b/src/java/org/apache/fop/render/AbstractPathOrientedRenderer.java @@ -29,6 +29,7 @@ import org.apache.fop.area.CTM; import org.apache.fop.area.RegionViewport; import org.apache.fop.area.Trait; import org.apache.fop.area.inline.InlineArea; +import org.apache.fop.area.inline.InlineBlockParent; import org.apache.fop.area.inline.Viewport; import org.apache.fop.datatypes.ColorType; import org.apache.fop.fo.Constants; @@ -361,6 +362,17 @@ public abstract class AbstractPathOrientedRenderer extends PrintRenderer { } } + /** @see org.apache.fop.render.AbstractRenderer */ + protected void renderInlineBlockParent(InlineBlockParent ibp) { + float start = currentIPPosition / 1000f; + float top = (ibp.getOffset() + currentBPPosition) / 1000f; + float width = ibp.getIPD() / 1000f; + float height = ibp.getBPD() / 1000f; + drawBackAndBorders(ibp, start, top, width, height); + + super.renderInlineBlockParent(ibp); + } + /** * @see org.apache.fop.render.AbstractRenderer#renderBlockViewport(BlockViewport, List) */ diff --git a/src/java/org/apache/fop/render/pdf/PDFRenderer.java b/src/java/org/apache/fop/render/pdf/PDFRenderer.java index 07a5ea7d7..4f23730cb 100644 --- a/src/java/org/apache/fop/render/pdf/PDFRenderer.java +++ b/src/java/org/apache/fop/render/pdf/PDFRenderer.java @@ -47,7 +47,6 @@ import org.apache.fop.area.Trait; import org.apache.fop.area.OffDocumentItem; import org.apache.fop.area.BookmarkData; import org.apache.fop.area.inline.Character; -import org.apache.fop.area.inline.InlineBlockParent; import org.apache.fop.area.inline.TextArea; import org.apache.fop.area.inline.ForeignObject; import org.apache.fop.area.inline.Image; @@ -1008,17 +1007,6 @@ public class PDFRenderer extends AbstractPathOrientedRenderer { } } - /** @see org.apache.fop.render.AbstractRenderer */ - protected void renderInlineBlockParent(InlineBlockParent ibp) { - float start = currentIPPosition / 1000f; - float top = (ibp.getOffset() + currentBPPosition) / 1000f; - float width = ibp.getIPD() / 1000f; - float height = ibp.getBPD() / 1000f; - drawBackAndBorders(ibp, start, top, width, height); - - super.renderInlineBlockParent(ibp); - } - /** * @see org.apache.fop.render.AbstractRenderer#renderCharacter(Character) */ |