Recalculate bounding box for the signature description in case no hei…

…ght is set DEVSIX-7970 Autoported commit. Original commit hash: [cd02c8ea9]
aleks-ivanov · Dec 15, 2023 · cdd3448 · cdd3448
1 parent 49100dc
commit cdd3448
Show file tree

Hide file tree

Showing 8 changed files with 14 additions and 12 deletions.
diff --git a/itext.tests/itext.forms.tests/itext/forms/form/element/SignatureFieldAppearanceTest.cs b/itext.tests/itext.forms.tests/itext/forms/form/element/SignatureFieldAppearanceTest.cs
@@ -331,7 +331,6 @@ public virtual void FontSizeTest() {
             String cmpPdf = SOURCE_FOLDER + "cmp_fontSizeTest.pdf";
             using (Document document = new Document(new PdfDocument(new PdfWriter(outPdf)))) {
                 SignatureFieldAppearance sigField = new SignatureFieldAppearance("SigField");
-                //TODO DEVSIX-7970 Fontsize doesn't get recalculate correctly in SignatureFieldAppearance making the signature look absent
                 sigField.SetFontSize(20);
                 sigField.SetContent("test");
                 document.Add(sigField);
@@ -342,7 +341,7 @@ public virtual void FontSizeTest() {
         [NUnit.Framework.Test]
         public virtual void FontNullCustomCheck() {
             String outPdf = DESTINATION_FOLDER + "fontNullCustomCheck.pdf";
-            PdfDocument pdfDoc = new _PdfDocument_413(new PdfWriter(outPdf));
+            PdfDocument pdfDoc = new _PdfDocument_412(new PdfWriter(outPdf));
             Document document = new Document(pdfDoc);
             SignatureFieldAppearance sigField = new SignatureFieldAppearance("SigField");
             sigField.SetContent("test");
@@ -355,8 +354,8 @@ public virtual void FontNullCustomCheck() {
             NUnit.Framework.Assert.AreEqual(LayoutExceptionMessageConstant.INVALID_FONT_PROPERTY_VALUE, e.Message);
         }
 
-        private sealed class _PdfDocument_413 : PdfDocument {
-            public _PdfDocument_413(PdfWriter baseArg1)
+        private sealed class _PdfDocument_412 : PdfDocument {
+            public _PdfDocument_412(PdfWriter baseArg1)
                 : base(baseArg1) {
             }
 

diff --git a/itext.tests/itext.forms.tests/resources/itext/forms/PdfUA2FormTest/cmp_signatureFormTest.pdf b/itext.tests/itext.forms.tests/resources/itext/forms/PdfUA2FormTest/cmp_signatureFormTest.pdf
diff --git a/...sts/resources/itext/forms/form/element/SignatureFieldAppearanceTest/cmp_basicSigField.pdf b/...sts/resources/itext/forms/form/element/SignatureFieldAppearanceTest/cmp_basicSigField.pdf
diff --git a/...ests/resources/itext/forms/form/element/SignatureFieldAppearanceTest/cmp_fontSizeTest.pdf b/...ests/resources/itext/forms/form/element/SignatureFieldAppearanceTest/cmp_fontSizeTest.pdf
diff --git a/itext.tests/itext.pdfa.tests/itext/pdfa/PdfAFormFieldTest.cs b/itext.tests/itext.pdfa.tests/itext/pdfa/PdfAFormFieldTest.cs
@@ -565,10 +565,10 @@ public virtual void TestCopyPagesDoesntEmbedHelveticaFont() {
         }
 
         [NUnit.Framework.Test]
-        public virtual void PdfASignatureFieldTestWithAndFontText() {
+        public virtual void PdfASignatureFieldWithTextAndFontTest() {
             String name = "pdfASignatureFieldTestWithText";
             String fileName = DESTINATION_FOLDER + name + ".pdf";
-            String cmp = SOURCE_FOLDER + "cmp/PdfAFormFieldTest/cmp_pdfASignatureFieldTestWithText.pdf";
+            String cmp = SOURCE_FOLDER + "cmp/PdfAFormFieldTest/cmp_" + name + ".pdf";
             PdfFont fontFreeSans = PdfFontFactory.CreateFont(SOURCE_FOLDER + "FreeSans.ttf", "WinAnsi", PdfFontFactory.EmbeddingStrategy
                 .FORCE_EMBEDDED);
             MakePdfDocument(fileName, cmp, (pdfDoc) => {

diff --git a/...a.tests/resources/itext/pdfa/cmp/PdfAFormFieldTest/cmp_pdfASignatureFieldTestWithText.pdf b/...a.tests/resources/itext/pdfa/cmp/PdfAFormFieldTest/cmp_pdfASignatureFieldTestWithText.pdf
diff --git a/itext/itext.forms/itext/forms/form/renderer/SignatureAppearanceRenderer.cs b/itext/itext.forms/itext/forms/form/renderer/SignatureAppearanceRenderer.cs
@@ -146,15 +146,18 @@ protected internal override void AdjustFieldLayout(LayoutContext layoutContext)
 
                 case SignatureAppearanceRenderer.RenderingMode.DESCRIPTION: {
                     // Default one, it just shows whatever description was defined for the signature.
+                    float additionalHeight = CalculateAdditionalHeight();
                     if (RetrieveHeight() == null) {
                         // Adjust calculated occupied area height to keep the same font size.
                         float calculatedHeight = GetOccupiedArea().GetBBox().GetHeight();
-                        GetOccupiedArea().GetBBox().MoveDown(calculatedHeight * TOP_SECTION).SetHeight(calculatedHeight * (1 + TOP_SECTION
-                            ));
-                        bBox.MoveDown(calculatedHeight * TOP_SECTION);
+                        // (calcHeight + addHeight + topSect) * (1 - TOP_SECTION) - addHeight = calcHeight, =>
+                        float topSection = (calculatedHeight + additionalHeight) * TOP_SECTION / (1 - TOP_SECTION);
+                        GetOccupiedArea().GetBBox().MoveDown(topSection + additionalHeight).SetHeight(calculatedHeight + topSection
+                             + additionalHeight);
+                        bBox.MoveDown(bBox.GetBottom() - GetOccupiedArea().GetBBox().GetBottom() - additionalHeight / 2);
                     }
-                    descriptionRect = bBox.SetHeight(GetOccupiedArea().GetBBox().GetHeight() * (1 - TOP_SECTION) - CalculateAdditionalHeight
-                        ());
+                    descriptionRect = bBox.SetHeight(GetOccupiedArea().GetBBox().GetHeight() * (1 - TOP_SECTION) - additionalHeight
+                        );
                     break;
                 }
 

diff --git a/port-hash b/port-hash
@@ -1 +1 @@
-c30189650192eacab3e419069eb9287211fbf6e6
+cd02c8ea9f548c039b2a0fb93872c5827912c247
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		c30189650192eacab3e419069eb9287211fbf6e6
		cd02c8ea9f548c039b2a0fb93872c5827912c247