3 files changed, 34 insertions, 4 deletions

diff --git a/src/ui/inputwidget.c b/src/ui/inputwidget.c
index 2ca9bd55..6246078e 100644
--- a/src/ui/inputwidget.c
+++ b/src/ui/inputwidget.c
@@ -709,10 +709,19 @@ void setMaxLen_InputWidget(iInputWidget *d, size_t maxLen) {
 }
 
 void setLineLimits_InputWidget(iInputWidget *d, int minLines, int maxLines) {
-    d->minWrapLines = minLines;
-    d->maxWrapLines = maxLines;
-    updateVisible_InputWidget_(d);
-    updateMetrics_InputWidget_(d);
+    if (d->minWrapLines != minLines || d->maxWrapLines != maxLines) {
+        d->minWrapLines = minLines;
+        d->maxWrapLines = maxLines;
+        updateVisible_InputWidget_(d);
+        updateMetrics_InputWidget_(d);
+    }
+}
+
+int minLines_InputWidget(const iInputWidget *d) {
+    return d->minWrapLines;
+}
+int maxLines_InputWidget(const iInputWidget *d) {
+    return d->maxWrapLines;
 }
 
 void setValidator_InputWidget(iInputWidget *d, iInputWidgetValidatorFunc validator, void *context) {
diff --git a/src/ui/inputwidget.h b/src/ui/inputwidget.h
index 959eb334..a94291ed 100644
--- a/src/ui/inputwidget.h
+++ b/src/ui/inputwidget.h
@@ -63,6 +63,8 @@ void    setUrlContent_InputWidget       (iInputWidget *, iBool isUrl);
 void    setNotifyEdits_InputWidget      (iInputWidget *, iBool notifyEdits);
 void    setEatEscape_InputWidget        (iInputWidget *, iBool eatEscape);
 
+int     minLines_InputWidget            (const iInputWidget *);
+int     maxLines_InputWidget            (const iInputWidget *);
 iInputWidgetContentPadding  contentPadding_InputWidget  (const iInputWidget *);
 const iString *             text_InputWidget            (const iInputWidget *);
 
diff --git a/src/ui/uploadwidget.c b/src/ui/uploadwidget.c
index 7dd26e93..7f2a68bf 100644
--- a/src/ui/uploadwidget.c
+++ b/src/ui/uploadwidget.c
@@ -24,6 +24,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */
 #include "labelwidget.h"
 #include "inputwidget.h"
 #include "documentwidget.h"
+#include "root.h"
 #include "color.h"
 #include "command.h"
 #include "gmrequest.h"
@@ -62,6 +63,20 @@ static void updateProgress_UploadWidget_(iGmRequest *request, size_t current, si
                        total);
 }
 
+static void updateInputMaxHeight_UploadWidget_(iUploadWidget *d) {
+    iWidget *w = as_Widget(d);    
+    /* Calculate how many lines fits vertically in the view. */
+    const iInt2 inputPos     = topLeft_Rect(bounds_Widget(as_Widget(d->input)));
+    const int   footerHeight = height_Widget(d->token) +
+                             height_Widget(findChild_Widget(w, "dialogbuttons")) +
+                             6 * gap_UI;
+    const int   avail        = bottom_Rect(safeRect_Root(w->root)) - footerHeight;
+    setLineLimits_InputWidget(d->input,
+                              minLines_InputWidget(d->input),
+                              iMaxi(minLines_InputWidget(d->input),
+                                    (avail - inputPos.y) / lineHeight_Text(monospace_FontId)));    
+}
+
 void init_UploadWidget(iUploadWidget *d) {
     iWidget *w = as_Widget(d);
     init_Widget(w);
@@ -152,6 +167,7 @@ void init_UploadWidget(iUploadWidget *d) {
     setFlags_Widget(as_Widget(d->token), expand_WidgetFlag, iTrue);
     setFocus_Widget(as_Widget(d->input));
     setBackupFileName_InputWidget(d->input, "uploadbackup.txt");
+    updateInputMaxHeight_UploadWidget_(d);
 }
 
 void deinit_UploadWidget(iUploadWidget *d) {    
@@ -214,6 +230,9 @@ static void requestFinished_UploadWidget_(iUploadWidget *d, iGmRequest *req) {
 static iBool processEvent_UploadWidget_(iUploadWidget *d, const SDL_Event *ev) {
     iWidget *w = as_Widget(d);
     const char *cmd = command_UserEvent(ev);
+    if (isResize_UserEvent(ev)) {
+        updateInputMaxHeight_UploadWidget_(d);
+    }
     if (isCommand_Widget(w, ev, "upload.cancel")) {
         setupSheetTransition_Mobile(w, iFalse);
         destroy_Widget(w);