From 09a731301c1af0faead45cb45de68bbcaea2b783 Mon Sep 17 00:00:00 2001
From: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006@gmx.net>
Date: Sun, 9 Oct 2016 02:06:51 +0200
Subject: [PATCH] Set a reasonable default max font size for form fields if
 autosize=on

---
 poppler/Annot.cc | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/poppler/Annot.cc b/poppler/Annot.cc
index 51a80e5d9c293164d58b3e06945822f75cc8d62f..a91a833504706328940a9a4f4ddfe5cf06389042 100644
--- a/poppler/Annot.cc
+++ b/poppler/Annot.cc
@@ -4275,6 +4275,7 @@ void AnnotWidget::drawText(GooString *text, GooString *da, GfxResources *resourc
   int rot;
   GBool freeText = gFalse;      // true if text should be freed before return
   GBool freeFont = gFalse;
+  double const maxAutoFontSize = 12;
 
   //~ if there is no MK entry, this should use the existing content stream,
   //~ and only replace the marked content portion of it
@@ -4410,8 +4411,9 @@ void AnnotWidget::drawText(GooString *text, GooString *da, GfxResources *resourc
     wMax = dx - 2 * borderWidth - 4;
 
     // compute font autosize
+    // FIXME: Allow setting max autosize from GUI
     if (fontSize == 0) {
-      for (fontSize = 20; fontSize > 1; --fontSize) {
+      for (fontSize = maxAutoFontSize ? maxAutoFontSize : 20; fontSize > 1; --fontSize) {
         y = dy - 3;
         i = 0;
         while (i < text->getLength()) {
@@ -4501,11 +4503,15 @@ void AnnotWidget::drawText(GooString *text, GooString *da, GfxResources *resourc
       w = (dx - 2 * borderWidth) / comb;
 
       // compute font autosize
+      // FIXME: Allow setting max autosize from GUI
       if (fontSize == 0) {
         fontSize = dy - 2 * borderWidth;
         if (w < fontSize) {
           fontSize = w;
         }
+        if (maxAutoFontSize) {
+          fontSize = std::min(maxAutoFontSize, fontSize);
+        }
         fontSize = floor(fontSize);
         if (tfPos >= 0) {
           tok = (GooString *)daToks->get(tfPos + 1);
@@ -4596,12 +4602,16 @@ void AnnotWidget::drawText(GooString *text, GooString *da, GfxResources *resourc
                  forceZapfDingbats);
 
       // compute font autosize
+      // FIXME: Allow setting max autosize from GUI
       if (fontSize == 0) {
         fontSize = dy - 2 * borderWidth;
         fontSize2 = (dx - 4 - 2 * borderWidth) / w;
         if (fontSize2 < fontSize) {
           fontSize = fontSize2;
         }
+        if (maxAutoFontSize) {
+          fontSize = std::min(maxAutoFontSize, fontSize);
+        }
         fontSize = floor(fontSize);
         if (tfPos >= 0) {
           tok = (GooString *)daToks->get(tfPos + 1);
@@ -4679,6 +4689,7 @@ void AnnotWidget::drawListBox(FormFieldChoice *fieldChoice,
   GfxFont *font;
   double fontSize, fontSize2, borderWidth, x, y, w, wMax;
   int tfPos, tmPos, i, j;
+  double const maxAutoFontSize = 12;
 
   //~ if there is no MK entry, this should use the existing content stream,
   //~ and only replace the marked content portion of it
@@ -4742,6 +4753,7 @@ void AnnotWidget::drawListBox(FormFieldChoice *fieldChoice,
   borderWidth = border ? border->getWidth() : 0;
 
   // compute font autosize
+  // FIXME: Allow setting max autosize from GUI
   if (fontSize == 0) {
     wMax = 0;
     for (i = 0; i < fieldChoice->getNumChoices(); ++i) {
@@ -4764,6 +4776,9 @@ void AnnotWidget::drawListBox(FormFieldChoice *fieldChoice,
     if (fontSize2 < fontSize) {
       fontSize = fontSize2;
     }
+    if (maxAutoFontSize) {
+      fontSize = std::min(maxAutoFontSize, fontSize);
+    }
     fontSize = floor(fontSize);
     if (tfPos >= 0) {
       tok = (GooString *)daToks->get(tfPos + 1);
-- 
1.9.1