UploadWidget: Fixes and improvements

Fixed update after undo. Line wrap long destination URLs. Don't open a new upload dialog if one is already open.

3 files changed, 9 insertions, 3 deletions

diff --git a/src/ui/documentwidget.c b/src/ui/documentwidget.c
index 8b4ee932..363dd357 100644
--- a/src/ui/documentwidget.c
+++ b/src/ui/documentwidget.c
@@ -2819,6 +2819,9 @@ static iBool handleCommand_DocumentWidget_(iDocumentWidget *d, const char *cmd)
         return wasHandled;
     }
     else if (equal_Command(cmd, "document.upload") && d == document_App()) {
+        if (findChild_Widget(root_Widget(w), "upload")) {
+            return iTrue; /* already open */
+        }
         if (equalCase_Rangecc(urlScheme_String(d->mod.url), "gemini") ||
             equalCase_Rangecc(urlScheme_String(d->mod.url), "titan")) {
             iUploadWidget *upload = new_UploadWidget();
diff --git a/src/ui/inputwidget.c b/src/ui/inputwidget.c
index bdce102a..9fbc8529 100644
--- a/src/ui/inputwidget.c
+++ b/src/ui/inputwidget.c
@@ -651,8 +651,9 @@ static iBool popUndo_InputWidget_(iInputWidget *d) {
         splitToLines_(&undo->text, &d->lines);
         d->cursor = undo->cursor;
         deinit_InputUndo_(undo);
-        popBack_Array(&d->undoStack);
+        popBack_Array(&d->undoStack);        
         iZap(d->mark);
+        updateAllLinesAndResizeHeight_InputWidget_(d);
         return iTrue;
     }
     return iFalse;
diff --git a/src/ui/uploadwidget.c b/src/ui/uploadwidget.c
index 391a5800..6dca729c 100644
--- a/src/ui/uploadwidget.c
+++ b/src/ui/uploadwidget.c
@@ -76,7 +76,10 @@ void init_UploadWidget(iUploadWidget *d) {
     addChildFlags_Widget(w,
                          iClob(new_LabelWidget(uiHeading_ColorEscape "${heading.upload}", NULL)),
                          frameless_WidgetFlag);
-    d->info = addChildFlags_Widget(w, iClob(new_LabelWidget("", NULL)), frameless_WidgetFlag);
+    d->info = addChildFlags_Widget(w, iClob(new_LabelWidget("", NULL)),
+                                   frameless_WidgetFlag | resizeToParentWidth_WidgetFlag |
+                                   fixedHeight_WidgetFlag);
+    setWrap_LabelWidget(d->info, iTrue);
     /* Tabs for input data. */
     iWidget *tabs = makeTabs_Widget(w);
     /* Make the tabs support vertical expansion based on content. */ {
@@ -176,7 +179,6 @@ static uint16_t titanPortForUrl_(const iString *url) {
 static void setUrlPort_UploadWidget_(iUploadWidget *d, const iString *url, uint16_t overridePort) {
     set_String(&d->originalUrl, url);
     iUrl parts;
-    const iString *root = collectNewRange_String(urlRoot_String(url));
     init_Url(&parts, url);
     setCStr_String(&d->url, "titan");
     appendRange_String(&d->url, (iRangecc){ parts.scheme.end, parts.host.end });