bckfnn      2004/10/10 14:08:16

  Modified:    src/java/org/apache/fop/fo/pagination RegionBody.java
  Log:
  Simplify the calculation of the viewport. Now that indents are
  calculated correctly, we can just use them without doing any lookup
  of absolute margins.
  
  Revision  Changes    Path
  1.30      +2 -33     xml-fop/src/java/org/apache/fop/fo/pagination/RegionBody.java
  
  Index: RegionBody.java
  ===================================================================
  RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/pagination/RegionBody.java,v
  retrieving revision 1.29
  retrieving revision 1.30
  diff -u -r1.29 -r1.30
  --- RegionBody.java   7 Sep 2004 20:47:10 -0000       1.29
  +++ RegionBody.java   10 Oct 2004 21:08:16 -0000      1.30
  @@ -25,11 +25,7 @@
   import org.apache.fop.datatypes.ColorType;
   import org.apache.fop.datatypes.FODimension;
   import org.apache.fop.fo.FONode;
  -import org.apache.fop.fo.FObj;
  -import org.apache.fop.fo.PropertyList;
   import org.apache.fop.fo.properties.CommonMarginBlock;
  -import org.apache.fop.fo.properties.Property;
  -import org.apache.fop.fo.FOPropertyMapping;
   
   /**
    * The fo:region-body element.
  @@ -57,36 +53,9 @@
           * set but indent is explicitly set, it will return that.
           */
           CommonMarginBlock mProps = propMgr.getMarginProps();
  -        int start = getRelMargin(PropertyList.START, PR_START_INDENT);
  -        Rectangle vpRect;
  -        if (this.wm == WritingMode.LR_TB || this.wm == WritingMode.RL_TB) {
  -            vpRect = new Rectangle(start, mProps.spaceBefore,
  -                    reldims.ipd - start
  -                        - getRelMargin(PropertyList.END, PR_END_INDENT),
  +        return new Rectangle(mProps.startIndent, mProps.spaceBefore,
  +                    reldims.ipd - mProps.startIndent - mProps.endIndent,
                       reldims.bpd - mProps.spaceBefore - mProps.spaceAfter);
  -        } else {
  -            vpRect = new Rectangle(start, mProps.spaceBefore,
  -                    reldims.bpd - mProps.spaceBefore - mProps.spaceAfter,
  -                    reldims.ipd - start
  -                        - getRelMargin(PropertyList.END, PR_END_INDENT));
  -        }
  -        return vpRect;
  -    }
  -
  -    /**
  -     * Get the relative margin using parent's writing mode, not own
  -     * writing mode.
  -     */
  -    private int getRelMargin(int reldir, int relPropId) {
  -        FObj parent = (FObj) getParent();
  -        String sPropName = "margin-"
  -                + parent.getPropertyList().getAbsoluteWritingMode(reldir);
  -        int propId = FOPropertyMapping.getPropertyId(sPropName);
  -        Property prop = propertyList.getExplicitOrShorthand(propId);
  -        if (prop == null) {
  -            prop = propertyList.getExplicitOrShorthand(relPropId);
  -        }
  -        return ((prop != null) ? prop.getLength().getValue() : 0);
       }
   
       /**
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Reply via email to