You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pdfbox.apache.org by ms...@apache.org on 2020/10/16 17:21:15 UTC

svn commit: r1882587 - /pdfbox/branches/2.0/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/form/AppearanceGeneratorHelper.java

Author: msahyoun
Date: Fri Oct 16 17:21:15 2020
New Revision: 1882587

URL: http://svn.apache.org/viewvc?rev=1882587&view=rev
Log:
PDFBOX-4984: respect different quadding for merged field/widget dicts as suggested by Gonçalo Santos

Modified:
    pdfbox/branches/2.0/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/form/AppearanceGeneratorHelper.java

Modified: pdfbox/branches/2.0/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/form/AppearanceGeneratorHelper.java
URL: http://svn.apache.org/viewvc/pdfbox/branches/2.0/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/form/AppearanceGeneratorHelper.java?rev=1882587&r1=1882586&r2=1882587&view=diff
==============================================================================
--- pdfbox/branches/2.0/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/form/AppearanceGeneratorHelper.java (original)
+++ pdfbox/branches/2.0/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/form/AppearanceGeneratorHelper.java Fri Oct 16 17:21:15 2020
@@ -573,7 +573,7 @@ class AppearanceGeneratorHelper
                                                     .width(contentRect.getWidth())
                                                     .wrapLines(isMultiLine())
                                                     .initialOffset(x, y)
-                                                    .textAlign(field.getQ())
+                                                    .textAlign(getTextAlign(widget))
                                                     .build();
             formatter.format();
         }
@@ -583,6 +583,12 @@ class AppearanceGeneratorHelper
         contents.close();
     }
 
+    private int getTextAlign(PDAnnotationWidget widget)
+    {
+        // Use quadding value from joined field/widget if set, else use from field.
+        return widget.getCOSObject().getInt(COSName.Q, field.getQ());
+    }
+
     private AffineTransform calculateMatrix(PDRectangle bbox, int rotation)
     {
         if (rotation == 0)