Support different border-radiuses. Some changes in border's abstraction concept.

DEVSIX-1569

Author: ars18wrw

io/src/main/java/com/itextpdf/io/LogMessageConstant.java

@@ -89,6 +89,7 @@ public final class LogMessageConstant {
     public static final String INVALID_KEY_VALUE_KEY_0_HAS_NULL_VALUE = "Invalid key value: key {0} has null value.";
     public static final String LAST_ROW_IS_NOT_COMPLETE = "Last row is not completed. Table bottom border may collapse as you do not expect it";
     public static final String MAKE_COPY_OF_CATALOG_DICTIONARY_IS_FORBIDDEN = "Make copy of Catalog dictionary is forbidden.";
+    public static final String METHOD_IS_NOT_IMPLEMENTED_BY_DEFAULT_OTHER_METHOD_WILL_BE_USED = "Method {0} is not implemented by default: please, override and implement it. {1} will be used instead.";
     public static final String NAME_ALREADY_EXISTS_IN_THE_NAME_TREE = "Name \"{0}\" already exists in the name tree; old value will be replaced by the new one.";
     public static final String NOT_TAGGED_PAGES_IN_TAGGED_DOCUMENT = "Not tagged pages are copied to the tagged document. Destination document now may contain not tagged content.";
     public static final String NO_FIELDS_IN_ACROFORM = "Required AcroForm entry /Fields does not exist in the document. Empty array /Fields will be created.";

layout/src/main/java/com/itextpdf/layout/ElementPropertyContainer.java

@@ -52,6 +52,7 @@ This file is part of the iText (R) project.
 import com.itextpdf.layout.layout.LayoutPosition;
 import com.itextpdf.layout.property.Background;
 import com.itextpdf.layout.property.BaseDirection;
+import com.itextpdf.layout.property.BorderRadius;
 import com.itextpdf.layout.property.FontKerning;
 import com.itextpdf.layout.property.HorizontalAlignment;
 import com.itextpdf.layout.property.Property;
@@ -534,6 +535,61 @@ public T setBorderLeft(Border border) {
         return (T) (Object) this;
     }
 
+    /**
+     * Sets a border radius for all four edges of this Element.
+     *
+     * @param borderRadius a customized {@link BorderRadius}
+     * @return this Element.
+     */
+    public T setBorderRadius(BorderRadius borderRadius) {
+        setProperty(Property.BORDER_RADIUS, borderRadius);
+        return (T) (Object) this;
+    }
+
+    /**
+     * Sets a border radius for the bottom left corner of this Element.
+     *
+     * @param borderRadius a customized {@link BorderRadius}
+     * @return this Element.
+     */
+    public T setBorderBottomLeftRadius(BorderRadius borderRadius) {
+        setProperty(Property.BORDER_BOTTOM_LEFT_RADIUS, borderRadius);
+        return (T) (Object) this;
+    }
+
+    /**
+     * Sets a border radius for the bottom right corner of this Element.
+     *
+     * @param borderRadius a customized {@link BorderRadius}
+     * @return this Element.
+     */
+    public T setBorderBottomRightRadius(BorderRadius borderRadius) {
+        setProperty(Property.BORDER_BOTTOM_RIGHT_RADIUS, borderRadius);
+        return (T) (Object) this;
+    }
+
+    /**
+     * Sets a border radius for the top left corner of this Element.
+     *
+     * @param borderRadius a customized {@link BorderRadius}
+     * @return this Element.
+     */
+    public T setBorderTopLeftRadius(BorderRadius borderRadius) {
+        setProperty(Property.BORDER_TOP_LEFT_RADIUS, borderRadius);
+        return (T) (Object) this;
+    }
+
+    /**
+     * Sets a border radius for the top right corner of this Element.
+     *
+     * @param borderRadius a customized {@link BorderRadius}
+     * @return this Element.
+     */
+    public T setBorderTopRightRadius(BorderRadius borderRadius) {
+        setProperty(Property.BORDER_TOP_RIGHT_RADIUS, borderRadius);
+        return (T) (Object) this;
+    }
+
     /**
      * Sets a rule for splitting strings when they don't fit into one line.
      * The default implementation is {@link com.itextpdf.layout.splitting.DefaultSplitCharacters}

layout/src/main/java/com/itextpdf/layout/border/Border.java

@@ -45,9 +45,13 @@ This file is part of the iText (R) project.
 
 import com.itextpdf.kernel.color.Color;
 import com.itextpdf.kernel.color.ColorConstants;
+import com.itextpdf.io.LogMessageConstant;
+import com.itextpdf.io.util.MessageFormatUtil;
 import com.itextpdf.kernel.geom.Point;
 import com.itextpdf.kernel.pdf.canvas.PdfCanvas;
 import com.itextpdf.layout.property.TransparentColor;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * Represents a border.
@@ -260,18 +264,65 @@ public void draw(PdfCanvas canvas, float x1, float y1, float x2, float y2, Side
      * <code>borderWidthAfter</code> - width of the left border. Those width are used to handle areas
      * of border joins.
      * </p>
+     * <p>
+     * <code>borderRadius</code> is used to draw rounded borders.
+     * </p>
      *
      * @param canvas            PdfCanvas to be written to
      * @param x1                x coordinate of the beginning point of the element side, that should be bordered
      * @param y1                y coordinate of the beginning point of the element side, that should be bordered
      * @param x2                x coordinate of the ending point of the element side, that should be bordered
      * @param y2                y coordinate of the ending point of the element side, that should be bordered
-     * @param borderRadius      border radius
-     * @param side              the {@link Border.Side}, that represents element side, that should be bordered
+     * @param borderRadius      defines the radius of the element's corners
+     * @param defaultSide       the {@link Border.Side}, that we will fallback to, if it cannot be determined by border coordinates
      * @param borderWidthBefore defines width of the border that is before the current one
      * @param borderWidthAfter  defines width of the border that is after the current one
      */
-    public abstract void draw(PdfCanvas canvas, float x1, float y1, float x2, float y2, float borderRadius, Side side, float borderWidthBefore, float borderWidthAfter);
+    public void draw(PdfCanvas canvas, float x1, float y1, float x2, float y2, float borderRadius, Side defaultSide, float borderWidthBefore, float borderWidthAfter) {
+        draw(canvas, x1, y1, x2, y2, borderRadius, borderRadius, borderRadius, borderRadius, defaultSide, borderWidthBefore, borderWidthAfter);
+    }
+
+    /**
+     * <p>
+     * All borders are supposed to be drawn in such way, that inner content of the element is on the right from the
+     * drawing direction. Borders are drawn in this order: top, right, bottom, left.
+     * </p>
+     * <p>
+     * Given points specify the line which lies on the border of the content area,
+     * therefore the border itself should be drawn to the left from the drawing direction.
+     * </p>
+     * <p>
+     * <code>borderWidthBefore</code> and <code>borderWidthAfter</code> parameters are used to
+     * define the widths of the borders that are before and after the current border, e.g. for
+     * the bottom border, <code>borderWidthBefore</code> specifies width of the right border and
+     * <code>borderWidthAfter</code> - width of the left border. Those width are used to handle areas
+     * of border joins.
+     * </p>
+     * <p>
+     * <code>horizontalRadius1</code>, <code>verticalRadius1</code>, <code>horizontalRadius2</code>
+     * and <code>verticalRadius2</code> are used to draw rounded borders.
+     * </p>
+     *
+     * @param canvas            PdfCanvas to be written to
+     * @param x1                x coordinate of the beginning point of the element side, that should be bordered
+     * @param y1                y coordinate of the beginning point of the element side, that should be bordered
+     * @param x2                x coordinate of the ending point of the element side, that should be bordered
+     * @param y2                y coordinate of the ending point of the element side, that should be bordered
+     * @param horizontalRadius1 defines the horizontal radius of the border's first corner
+     * @param verticalRadius1   defines the vertical radius of the border's first corner
+     * @param horizontalRadius2 defines the horizontal radius of the border's second corner
+     * @param verticalRadius2   defines the vertical radius of the border's second corner
+     * @param defaultSide       the {@link Border.Side}, that we will fallback to, if it cannot be determined by border coordinates
+     * @param borderWidthBefore defines width of the border that is before the current one
+     * @param borderWidthAfter  defines width of the border that is after the current one
+     */
+    public void draw(PdfCanvas canvas, float x1, float y1, float x2, float y2, float horizontalRadius1, float verticalRadius1, float horizontalRadius2, float verticalRadius2, Side defaultSide, float borderWidthBefore, float borderWidthAfter) {
+        Logger logger = LoggerFactory.getLogger(Border.class);
+        logger.warn(MessageFormatUtil.format(LogMessageConstant.METHOD_IS_NOT_IMPLEMENTED_BY_DEFAULT_OTHER_METHOD_WILL_BE_USED,
+                "Border#draw(PdfCanvas, float, float, float, float, float, float, float, float, Side, float, float",
+                "Border#draw(PdfCanvas, float, float, float, float, Side, float, float)"));
+        draw(canvas, x1, y1, x2, y2, defaultSide, borderWidthBefore, borderWidthAfter);
+    }
 
     /**
      * Draws the border of a cell.
@@ -320,6 +371,7 @@ public float getWidth() {
 
     /**
      * Sets the {@link Color color} of the {@link Border border}
+     *
      * @param color The color
      */
     public void setColor(Color color) {
@@ -329,6 +381,7 @@ public void setColor(Color color) {
 
     /**
      * Sets the width of the {@link Border border}
+     *
      * @param width The width
      */
     public void setWidth(float width) {

layout/src/main/java/com/itextpdf/layout/border/Border3D.java

@@ -206,11 +206,6 @@ public void draw(PdfCanvas canvas, float x1, float y1, float x2, float y2, float
         canvas.restoreState();
     }
 
-    @Override
-    public void draw(PdfCanvas canvas, float x1, float y1, float x2, float y2, float borderRadius, Side side, float borderWidthBefore, float borderWidthAfter) {
-        draw(canvas, x1, y1, x2, y2, borderWidthBefore, borderWidthAfter);
-    }
-
     /**
      * {@inheritDoc}
      */

layout/src/main/java/com/itextpdf/layout/border/DashedBorder.java

@@ -179,7 +179,7 @@ public void drawCellBorder(PdfCanvas canvas, float x1, float y1, float x2, float
     }
 
     @Override
-    public void draw(PdfCanvas canvas, float x1, float y1, float x2, float y2, float outerRadius, Side side, float borderWidthBefore, float borderWidthAfter) {
+    public void draw(PdfCanvas canvas, float x1, float y1, float x2, float y2, float horizontalRadius1, float verticalRadius1, float horizontalRadius2, float verticalRadius2, Side defaultSide, float borderWidthBefore, float borderWidthAfter) {
         float curv = 0.447f;
         float initialGap = width * GAP_MODIFIER;
         float dash = width * DASH_MODIFIER;
@@ -194,10 +194,10 @@ public void draw(PdfCanvas canvas, float x1, float y1, float x2, float y2, float
         // Points (x0, y0) and (x3, y3) are used to produce Bezier curve
         float x0 = x1, y0 = y1,
                 x3 = x2, y3 = y2;
-
-        float innerRadiusBefore = Math.max(0, outerRadius - borderWidthBefore),
-                innerRadius = Math.max(0, outerRadius - width),
-                innerRadiusAfter = Math.max(0, outerRadius - borderWidthAfter);
+        float innerRadiusBefore,
+                innerRadiusFirst,
+                innerRadiusSecond,
+                innerRadiusAfter;
 
         float widthHalf = width / 2;
 
@@ -209,14 +209,21 @@ public void draw(PdfCanvas canvas, float x1, float y1, float x2, float y2, float
         canvas.setLineDash(dash, adjustedGap, dash + adjustedGap / 2);
 
         Point clipPoint1, clipPoint2, clipPoint;
-        Border.Side borderSide = getBorderSide(x1, y1, x2, y2, side);
+        Border.Side borderSide = getBorderSide(x1, y1, x2, y2, defaultSide);
         switch (borderSide) {
             case TOP:
+
+                innerRadiusBefore = Math.max(0, horizontalRadius1 - borderWidthBefore);
+                innerRadiusFirst = Math.max(0, verticalRadius1 - width);
+                innerRadiusSecond = Math.max(0, verticalRadius2 - width);
+                innerRadiusAfter = Math.max(0, horizontalRadius2 - borderWidthAfter);
+
+
                 x0 -= borderWidthBefore / 2;
-                y0 -= innerRadius;
+                y0 -= innerRadiusFirst;
 
                 x3 += borderWidthAfter / 2;
-                y3 -= innerRadius;
+                y3 -= innerRadiusSecond;
 
                 clipPoint1 = getIntersectionPoint(new Point(x1 - borderWidthBefore, y1 + width), new Point(x1, y1), new Point(x0, y0), new Point(x0 + 10, y0));
                 clipPoint2 = getIntersectionPoint(new Point(x2 + borderWidthAfter, y2 + width), new Point(x2, y2), new Point(x3, y3), new Point(x3 - 10, y3));
@@ -235,15 +242,20 @@ public void draw(PdfCanvas canvas, float x1, float y1, float x2, float y2, float
                 y2 += widthHalf;
 
                 canvas
-                        .moveTo(x0, y0).curveTo(x0, y0 + innerRadius * curv, x1 - innerRadiusBefore * curv, y1, x1, y1)
+                        .moveTo(x0, y0).curveTo(x0, y0 + innerRadiusFirst * curv, x1 - innerRadiusBefore * curv, y1, x1, y1)
                         .lineTo(x2, y2)
-                        .curveTo(x2 + innerRadiusAfter * curv, y2, x3, y3 + innerRadius * curv, x3, y3);
+                        .curveTo(x2 + innerRadiusAfter * curv, y2, x3, y3 + innerRadiusSecond * curv, x3, y3);
                 break;
             case RIGHT:
-                x0 -= innerRadius;
+                innerRadiusBefore = Math.max(0, verticalRadius1 - borderWidthBefore);
+                innerRadiusFirst = Math.max(0, horizontalRadius1 - width);
+                innerRadiusSecond = Math.max(0, horizontalRadius2 - width);
+                innerRadiusAfter = Math.max(0, verticalRadius2 - borderWidthAfter);
+
+                x0 -= innerRadiusFirst;
                 y0 += borderWidthBefore / 2;
 
-                x3 -= innerRadius;
+                x3 -= innerRadiusSecond;
                 y3 -= borderWidthAfter;
 
                 clipPoint1 = getIntersectionPoint(new Point(x1 + width, y1 + borderWidthBefore), new Point(x1, y1), new Point(x0, y0), new Point(x0, y0 - 10));
@@ -263,17 +275,22 @@ public void draw(PdfCanvas canvas, float x1, float y1, float x2, float y2, float
                 y2 += innerRadiusAfter;
 
                 canvas
-                        .moveTo(x0, y0).curveTo(x0 + innerRadius * curv, y0, x1, y1 + innerRadiusBefore * curv, x1, y1)
+                        .moveTo(x0, y0).curveTo(x0 + innerRadiusFirst * curv, y0, x1, y1 + innerRadiusBefore * curv, x1, y1)
                         .lineTo(x2, y2)
-                        .curveTo(x2, y2 - innerRadiusAfter * curv, x3 + innerRadius * curv, y3, x3, y3);
+                        .curveTo(x2, y2 - innerRadiusAfter * curv, x3 + innerRadiusSecond * curv, y3, x3, y3);
 
                 break;
             case BOTTOM:
+                innerRadiusBefore = Math.max(0, horizontalRadius1 - borderWidthBefore);
+                innerRadiusFirst = Math.max(0, verticalRadius1 - width);
+                innerRadiusSecond = Math.max(0, verticalRadius2 - width);
+                innerRadiusAfter = Math.max(0, horizontalRadius2 - borderWidthAfter);
+
                 x0 += borderWidthBefore / 2;
-                y0 += innerRadius;
+                y0 += innerRadiusFirst;
 
                 x3 -= borderWidthAfter / 2;
-                y3 += innerRadius;
+                y3 += innerRadiusSecond;
 
                 clipPoint1 = getIntersectionPoint(new Point(x1 + borderWidthBefore, y1 - width), new Point(x1, y1), new Point(x0, y0), new Point(x0 - 10, y0));
                 clipPoint2 = getIntersectionPoint(new Point(x2 - borderWidthAfter, y2 - width), new Point(x2, y2), new Point(x3, y3), new Point(x3 + 10, y3));
@@ -292,16 +309,21 @@ public void draw(PdfCanvas canvas, float x1, float y1, float x2, float y2, float
                 y2 -= widthHalf;
 
                 canvas
-                        .moveTo(x0, y0).curveTo(x0, y0 - innerRadius * curv, x1 + innerRadiusBefore * curv, y1, x1, y1)
+                        .moveTo(x0, y0).curveTo(x0, y0 - innerRadiusFirst * curv, x1 + innerRadiusBefore * curv, y1, x1, y1)
                         .lineTo(x2, y2)
-                        .curveTo(x2 - innerRadiusAfter * curv, y2, x3, y3 - innerRadius * curv, x3, y3);
+                        .curveTo(x2 - innerRadiusAfter * curv, y2, x3, y3 - innerRadiusSecond * curv, x3, y3);
 
                 break;
             case LEFT:
-                x0 += innerRadius;
+                innerRadiusBefore = Math.max(0, verticalRadius1 - borderWidthBefore);
+                innerRadiusFirst = Math.max(0, horizontalRadius1 - width);
+                innerRadiusSecond = Math.max(0, horizontalRadius2 - width);
+                innerRadiusAfter = Math.max(0, verticalRadius2 - borderWidthAfter);
+                
+                x0 += innerRadiusFirst;
                 y0 -= borderWidthBefore / 2;
 
-                x3 += innerRadius;
+                x3 += innerRadiusSecond;
                 y3 += borderWidthAfter;
 
                 clipPoint1 = getIntersectionPoint(new Point(x1 - width, y1 - borderWidthBefore), new Point(x1, y1), new Point(x0, y0), new Point(x0, y0 + 10));
@@ -321,15 +343,16 @@ public void draw(PdfCanvas canvas, float x1, float y1, float x2, float y2, float
                 y2 -= innerRadiusAfter;
 
                 canvas
-                        .moveTo(x0, y0).curveTo(x0 - innerRadius * curv, y0, x1, y1 - innerRadiusBefore * curv, x1, y1)
+                        .moveTo(x0, y0).curveTo(x0 - innerRadiusFirst * curv, y0, x1, y1 - innerRadiusBefore * curv, x1, y1)
                         .lineTo(x2, y2)
-                        .curveTo(x2, y2 + innerRadiusAfter * curv, x3 - innerRadius * curv, y3, x3, y3);
+                        .curveTo(x2, y2 + innerRadiusAfter * curv, x3 - innerRadiusSecond * curv, y3, x3, y3);
                 break;
         }
         canvas
                 .stroke()
-                .restoreState();
-    }
+                .restoreState();    }
+
+    /**
 
     /**
      * Adjusts the size of the gap between dots