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:22:18 UTC

svn commit: r1882588 - /pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/form/AppearanceGeneratorHelper.java

Author: msahyoun
Date: Fri Oct 16 17:22:18 2020
New Revision: 1882588

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

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

Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/form/AppearanceGeneratorHelper.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/form/AppearanceGeneratorHelper.java?rev=1882588&r1=1882587&r2=1882588&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/form/AppearanceGeneratorHelper.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/form/AppearanceGeneratorHelper.java Fri Oct 16 17:22:18 2020
@@ -562,7 +562,7 @@ class AppearanceGeneratorHelper
                         .width(contentRect.getWidth())
                         .wrapLines(isMultiLine())
                         .initialOffset(x, y)
-                        .textAlign(field.getQ())
+                        .textAlign(getTextAlign(widget))
                         .build();
                 formatter.format();
             }
@@ -572,6 +572,13 @@ class AppearanceGeneratorHelper
         }
     }
     
+    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)