3 files changed, 33 insertions, 19 deletions

diff --git a/src/ui/uploadwidget.c b/src/ui/uploadwidget.c
index 1b26922c..ab1afae9 100644
--- a/src/ui/uploadwidget.c
+++ b/src/ui/uploadwidget.c
@@ -107,9 +107,11 @@ static void updateInputMaxHeight_UploadWidget_(iUploadWidget *d) {
 static const iArray *makeIdentityItems_UploadWidget_(const iUploadWidget *d) {
     iArray *items = collectNew_Array(sizeof(iMenuItem));
     const iGmIdentity *urlId = identityForUrl_GmCerts(certs_App(), &d->url);
-    pushBack_Array(items, &(iMenuItem){ format_CStr("${dlg.upload.id.default} (%s)",
-                                                    urlId ? cstr_String(name_GmIdentity(urlId)) : "${dlg.upload.id.none}"),
-                                        0, 0, "upload.setid arg:1" });
+    pushBack_Array(items,
+                   &(iMenuItem){ format_CStr("${dlg.upload.id.default} (%s)",
+                                             urlId ? cstr_String(name_GmIdentity(urlId))
+                                                   : "${dlg.upload.id.none}"),
+                                 0, 0, "upload.setid arg:1" });
     pushBack_Array(items, &(iMenuItem){ "${dlg.upload.id.none}", 0, 0, "upload.setid arg:0" });
     pushBack_Array(items, &(iMenuItem){ "---" });
     iConstForEach(PtrArray, i, listIdentities_GmCerts(certs_App(), NULL, NULL)) {
@@ -219,21 +221,31 @@ void init_UploadWidget(iUploadWidget *d) {
             setFixedSize_Widget(as_Widget(d->mime), init_I2(70 * gap_UI, -1));
             addTwoColumnDialogInputField_Widget(headings, values, "${upload.mime}", "upload.mime", iClob(d->mime));
         }
-        /* Token. */ {
+        /* Identity and Token. */ {
             addChild_Widget(w, iClob(makePadding_Widget(gap_UI)));
             iWidget *page = makeTwoColumns_Widget(&headings, &values);
+            /* Token. */
             d->token = addTwoColumnDialogInputField_Widget(
                 headings, values, "${upload.token}", "upload.token", iClob(new_InputWidget(0)));
             setHint_InputWidget(d->token, "${hint.upload.token}");
-            setFixedSize_Widget(as_Widget(d->token), init_I2(50 * gap_UI, -1));
+            setFixedSize_Widget(as_Widget(d->token), init_I2(50 * gap_UI, -1));            
+            /* Identity. */
+            const iArray *   identItems = makeIdentityItems_UploadWidget_(d);
+            const iMenuItem *items      = constData_Array(identItems);
+            const size_t     numItems   = size_Array(identItems);
+            iLabelWidget *   ident      = makeMenuButton_LabelWidget("${upload.id}", items, numItems);
+            setTextCStr_LabelWidget(ident, items[findWidestLabel_MenuItem(items, numItems)].label);
+            addChild_Widget(headings, iClob(makeHeading_Widget("${upload.id}")));
+            setId_Widget(addChildFlags_Widget(values, iClob(ident), alignLeft_WidgetFlag), "upload.id");
             addChild_Widget(w, iClob(page));
         }
         /* Buttons. */ {
             addChild_Widget(w, iClob(makePadding_Widget(gap_UI)));
             iWidget *buttons = makeDialogButtons_Widget(actions, iElemCount(actions));
             setId_Widget(insertChildAfterFlags_Widget(buttons,
-                                                 iClob(d->counter = new_LabelWidget("", NULL)),
-                                                 0, frameless_WidgetFlag),
+                                                      iClob(d->counter = new_LabelWidget("", NULL)),
+                                                      0,
+                                                      frameless_WidgetFlag),
                          "upload.counter");
             addChild_Widget(w, iClob(buttons));
         }
diff --git a/src/ui/util.c b/src/ui/util.c
index 5361250f..01939e66 100644
--- a/src/ui/util.c
+++ b/src/ui/util.c
@@ -1490,7 +1490,7 @@ iWidget *makeQuestion_Widget(const char *title, const char *msg,
     addChild_Widget(dlg->root->widget, iClob(dlg));
     arrange_Widget(dlg); /* BUG: This extra arrange shouldn't be needed but the dialog won't
                             be arranged correctly unless it's here. */
-    finalizeSheet_Mobile(dlg);
+    setupSheetTransition_Mobile(dlg, iTrue);
     return dlg;
 }
 
@@ -1726,7 +1726,7 @@ static void addDialogToggle_(iWidget *headings, iWidget *values,
     addChild_Widget(values, iClob(makeToggle_Widget(toggleId)));
 }
 
-static size_t findWidestItemLabel_(const iMenuItem *items, size_t num) {
+size_t findWidestLabel_MenuItem(const iMenuItem *items, size_t num) {
     int widest = 0;
     size_t widestPos = iInvalidPos;
     for (size_t i = 0; i < num && items[i].label; i++) {
@@ -1947,10 +1947,10 @@ iWidget *makePreferences_Widget(void) {
         };
         iString *aboutText = collectNew_String(); {
             setCStr_String(aboutText, "Lagrange " LAGRANGE_APP_VERSION);
-            #if defined (iPlatformAppleMobile)
+#if defined (iPlatformAppleMobile)
             appendFormat_String(aboutText, " (" LAGRANGE_IOS_VERSION ") %s" LAGRANGE_IOS_BUILD_DATE,
                                 escape_Color(uiTextDim_ColorId));
-            #endif
+#endif
         }
         const iMenuItem aboutPanelItems[] = {
             { format_CStr("heading text:%s", cstr_String(aboutText)) },
@@ -2015,7 +2015,7 @@ iWidget *makePreferences_Widget(void) {
             iArray *uiLangs = collectNew_Array(sizeof(iMenuItem));
             pushBackN_Array(uiLangs, langItems, iElemCount(langItems) - 1);
             /* TODO: Add an arrange flag for resizing parent to widest child. */
-            size_t widestPos = findWidestItemLabel_(data_Array(uiLangs), size_Array(uiLangs));
+            size_t widestPos = findWidestLabel_MenuItem(data_Array(uiLangs), size_Array(uiLangs));
             addChild_Widget(headings, iClob(makeHeading_Widget("${prefs.uilang}")));
             setId_Widget(addChildFlags_Widget(values,
                                               iClob(makeMenuButton_LabelWidget(
@@ -2034,7 +2034,7 @@ iWidget *makePreferences_Widget(void) {
         addChild_Widget(headings, iClob(makeHeading_Widget("${prefs.returnkey}")));
         /* Return key behaviors. */ {
             iLabelWidget *returnKey = makeMenuButton_LabelWidget(
-                returnKeyBehaviors[findWidestItemLabel_(returnKeyBehaviors,
+                returnKeyBehaviors[findWidestLabel_MenuItem(returnKeyBehaviors,
                                                         iElemCount(returnKeyBehaviors) - 1)]
                     .label,
                 returnKeyBehaviors,
@@ -2104,7 +2104,7 @@ iWidget *makePreferences_Widget(void) {
             const char *mode = isDark ? "dark" : "light";
             addChild_Widget(headings, iClob(makeHeading_Widget(isDark ? "${prefs.doctheme.dark}" : "${prefs.doctheme.light}")));
             iLabelWidget *button = makeMenuButton_LabelWidget(
-                docThemes[i][findWidestItemLabel_(docThemes[i], max_GmDocumentTheme)].label,
+                docThemes[i][findWidestLabel_MenuItem(docThemes[i], max_GmDocumentTheme)].label,
                 docThemes[i],
                 max_GmDocumentTheme);
             //            setFrameColor_Widget(findChild_Widget(as_Widget(button), "menu"),
@@ -2125,7 +2125,7 @@ iWidget *makePreferences_Widget(void) {
         /* Colorize images. */ {
             addChild_Widget(headings, iClob(makeHeading_Widget("${prefs.imagestyle}")));
             iLabelWidget *button = makeMenuButton_LabelWidget(
-                imgStyles[findWidestItemLabel_(imgStyles, iElemCount(imgStyles) - 1)].label,
+                imgStyles[findWidestLabel_MenuItem(imgStyles, iElemCount(imgStyles) - 1)].label,
                 imgStyles,
                 iElemCount(imgStyles) - 1);
             setBackgroundColor_Widget(findChild_Widget(as_Widget(button), "menu"),
@@ -2254,7 +2254,8 @@ iWidget *makePreferences_Widget(void) {
                     iClob(makeDialogButtons_Widget(
                         (iMenuItem[]){ { "${close}", SDLK_ESCAPE, 0, "prefs.dismiss" } }, 1)));
     addChild_Widget(dlg->root->widget, iClob(dlg));
-    finalizeSheet_Mobile(dlg);
+//    finalizeSheet_Mobile(dlg);
+//    arrange_Widget(dlg);
     setupSheetTransition_Mobile(dlg, iTrue);
 //    printTree_Widget(dlg);
     return dlg;
@@ -2312,7 +2313,7 @@ iWidget *makeBookmarkEditor_Widget(void) {
     addChild_Widget(dlg, iClob(makePadding_Widget(gap_UI)));
     addChild_Widget(dlg, iClob(makeDialogButtons_Widget(actions, iElemCount(actions))));
     addChild_Widget(get_Root()->widget, iClob(dlg));
-    finalizeSheet_Mobile(dlg);
+    setupSheetTransition_Mobile(dlg, iTrue);
     return dlg;
 }
 
@@ -2509,7 +2510,6 @@ iWidget *makeIdentityCreation_Widget(void) {
             { "input collapse:1 id:ident.country hint:hint.newident.optional text:${dlg.newident.country}" },
             { NULL }
         }, actions, iElemCount(actions));
-        setupSheetTransition_Mobile(dlg, iTrue);
     }
     else {
         dlg = makeSheet_Widget("ident");
@@ -2578,8 +2578,8 @@ iWidget *makeIdentityCreation_Widget(void) {
         }
         addChild_Widget(dlg, iClob(makeDialogButtons_Widget(actions, iElemCount(actions))));
         addChild_Widget(get_Root()->widget, iClob(dlg));
-        finalizeSheet_Mobile(dlg);
     }
+    setupSheetTransition_Mobile(dlg, iTrue);
     return dlg;
 }
 
diff --git a/src/ui/util.h b/src/ui/util.h
index 938a200d..3dd4e153 100644
--- a/src/ui/util.h
+++ b/src/ui/util.h
@@ -232,6 +232,8 @@ void        openMenu_Widget     (iWidget *, iInt2 windowCoord);
 void        openMenuFlags_Widget(iWidget *, iInt2 windowCoord, iBool postCommands);
 void        closeMenu_Widget    (iWidget *);
 
+size_t      findWidestLabel_MenuItem        (const iMenuItem *items, size_t num);
+
 iLabelWidget *  findMenuItem_Widget         (iWidget *menu, const char *command);
 void            setMenuItemDisabled_Widget  (iWidget *menu, const char *command, iBool disable);