3 files changed, 33 insertions, 23 deletions

diff --git a/src/ui/labelwidget.c b/src/ui/labelwidget.c
index d00733e1..9e0d37e4 100644
--- a/src/ui/labelwidget.c
+++ b/src/ui/labelwidget.c
@@ -195,6 +195,7 @@ static void getColors_LabelWidget_(const iLabelWidget *d, int *bg, int *fg, int
                                    int *icon, int *meta) {
     const iWidget *w           = constAs_Widget(d);
     const int64_t  flags       = flags_Widget(w);
+    const iBool    isHover     = isHover_LabelWidget_(d);
     const iBool    isFocus     = (flags & focusable_WidgetFlag && isFocused_Widget(d));
     const iBool    isPress     = (flags & pressed_WidgetFlag) != 0;
     const iBool    isSel       = (flags & selected_WidgetFlag) != 0;
@@ -222,9 +223,6 @@ static void getColors_LabelWidget_(const iLabelWidget *d, int *bg, int *fg, int
     if (isSel) {
         if (!d->flags.checkMark) {     
             *bg = uiBackgroundSelected_ColorId;
-//        if (!isKeyRoot) {
-//            *bg = uiEmbossSelected1_ColorId; //uiBackgroundUnfocusedSelection_ColorId;
-//        }
             if (!isKeyRoot) {
                 *bg = isDark_ColorTheme(colorTheme_App()) ? uiBackgroundUnfocusedSelection_ColorId
                     : uiMarked_ColorId;
@@ -249,7 +247,7 @@ static void getColors_LabelWidget_(const iLabelWidget *d, int *bg, int *fg, int
     if (colorEscape == uiTextCaution_ColorId) {
         *icon = *meta = colorEscape;
     }
-    if (isHover_LabelWidget_(d)) {
+    if (isHover) {
         if (isFrameless) {
             *bg = uiBackgroundFramelessHover_ColorId;
             *fg = uiTextFramelessHover_ColorId;
@@ -275,7 +273,7 @@ static void getColors_LabelWidget_(const iLabelWidget *d, int *bg, int *fg, int
         }
     }
     if (d->forceFg >= 0) {
-        *fg = /* *icon = */ *meta = d->forceFg;
+        *fg = *meta = d->forceFg;
     }
     if (isPress) {
         if (colorEscape == uiTextAction_ColorId || colorEscape == uiTextCaution_ColorId) {
@@ -290,14 +288,13 @@ static void getColors_LabelWidget_(const iLabelWidget *d, int *bg, int *fg, int
                 *frame1 = uiEmbossPressed1_ColorId;
                 *frame2 = colorEscape != none_ColorId ? colorEscape : uiEmbossPressed2_ColorId;
             }
-            //if (colorEscape == none_ColorId || colorEscape == uiTextAction_ColorId) {
             *fg = *icon = *meta = uiTextPressed_ColorId | permanent_ColorId;
-    //        }
-    //        else {
-    //            *fg = (isDark_ColorTheme(colorTheme_App()) ? white_ColorId : black_ColorId) | permanent_ColorId;
-    //        }
         }
     }
+    if (((isSel || isHover) && isFrameless) || isPress) {
+        /* Ensure that the full label text remains readable. */
+        *fg |= permanent_ColorId;
+    }
 }
 
 iLocalDef int iconPadding_LabelWidget_(const iLabelWidget *d) {
diff --git a/src/ui/uploadwidget.c b/src/ui/uploadwidget.c
index ef407b6d..e0bc3755 100644
--- a/src/ui/uploadwidget.c
+++ b/src/ui/uploadwidget.c
@@ -58,6 +58,7 @@ struct Impl_UploadWidget {
     iLabelWidget *   info;
     iInputWidget *   mime;
     iInputWidget *   token;
+    iLabelWidget *   ident;       
     iInputWidget *   input;
     iLabelWidget *   filePathLabel;
     iLabelWidget *   fileSizeLabel;
@@ -124,9 +125,10 @@ static const iArray *makeIdentityItems_UploadWidget_(const iUploadWidget *d) {
     iConstForEach(PtrArray, i, listIdentities_GmCerts(certs_App(), NULL, NULL)) {
         const iGmIdentity *id = i.ptr;
         iString *str = collect_String(copy_String(name_GmIdentity(id)));
+        prependCStr_String(str, uiTextStrong_ColorEscape);
         if (!isEmpty_String(&id->notes)) {
             appendFormat_String(
-                str, "\n%s%s", escape_Color(uiAnnotation_ColorId), cstr_String(&id->notes));
+                str, "\n%s%s", escape_Color(uiTextDim_ColorId), cstr_String(&id->notes));
         }
         pushBack_Array(
             items,
@@ -259,19 +261,20 @@ void init_UploadWidget(iUploadWidget *d) {
         /* 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));            
             /* 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);
+            d->ident                    = makeMenuButton_LabelWidget("${upload.id}", items, numItems);
+            setTextCStr_LabelWidget(d->ident, items[findWidestLabel_MenuItem(items, numItems)].label);
+            //setFixedSize_Widget(as_Widget(d->ident), init_I2(50 * gap_UI, ));
             addChild_Widget(headings, iClob(makeHeading_Widget("${upload.id}")));
-            setId_Widget(addChildFlags_Widget(values, iClob(ident), alignLeft_WidgetFlag), "upload.id");
+            setId_Widget(addChildFlags_Widget(values, iClob(d->ident), alignLeft_WidgetFlag), "upload.id");
+            /* 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));            
             addChild_Widget(w, iClob(page));
         }
         /* Buttons. */ {
@@ -287,6 +290,8 @@ void init_UploadWidget(iUploadWidget *d) {
         resizeToLargestPage_Widget(tabs);
         arrange_Widget(w);
         setFixedSize_Widget(as_Widget(d->token), init_I2(width_Widget(tabs) - left_Rect(parent_Widget(d->token)->rect), -1));
+        setFixedSize_Widget(as_Widget(d->ident), init_I2(width_Widget(d->token),
+                                                         lineHeight_Text(uiLabel_FontId) + 2 * gap_UI));
         setFlags_Widget(as_Widget(d->token), expand_WidgetFlag, iTrue);
         setFocus_Widget(as_Widget(d->input));
     }
@@ -560,7 +565,7 @@ static iBool processEvent_UploadWidget_(iUploadWidget *d, const SDL_Event *ev) {
         destroy_Widget(w);
         return iTrue;        
     }
-    else if (isCommand_Widget(w, ev, "input.resized")) {
+    else if (!isUsingPanelLayout_Mobile() && isCommand_Widget(w, ev, "input.resized")) {
         resizeToLargestPage_Widget(findChild_Widget(w, "upload.tabs"));
         arrange_Widget(w);
         refresh_Widget(w);
diff --git a/src/ui/util.c b/src/ui/util.c
index 21067bf4..73fafe84 100644
--- a/src/ui/util.c
+++ b/src/ui/util.c
@@ -1327,6 +1327,12 @@ const iString *removeMenuItemLabelPrefixes_String(const iString *d) {
     return collect_String(str);
 }
 
+static const iString *replaceNewlinesWithDash_(const iString *str) {
+    iString *mod = copy_String(str);
+    replace_String(mod, "\n", "  ");
+    return collect_String(mod);
+}
+
 void updateDropdownSelection_LabelWidget(iLabelWidget *dropButton, const char *selectedCommand) {
     if (!dropButton) {
         return;
@@ -1337,8 +1343,9 @@ void updateDropdownSelection_LabelWidget(iLabelWidget *dropButton, const char *s
         iMenuItem *item = findNativeMenuItem_Widget(menu, selectedCommand);
         if (item) {
             setSelected_NativeMenuItem(item, iTrue);
-            updateText_LabelWidget(
-                dropButton, removeMenuItemLabelPrefixes_String(collectNewCStr_String(item->label)));
+            updateText_LabelWidget(dropButton,
+                                   replaceNewlinesWithDash_(removeMenuItemLabelPrefixes_String(
+                                       collectNewCStr_String(item->label))));
             checkIcon_LabelWidget(dropButton);
         }
         return;
@@ -1349,7 +1356,8 @@ void updateDropdownSelection_LabelWidget(iLabelWidget *dropButton, const char *s
             const iBool isSelected = endsWith_String(command_LabelWidget(item), selectedCommand);
             setFlags_Widget(as_Widget(item), selected_WidgetFlag, isSelected);
             if (isSelected) {
-                updateText_LabelWidget(dropButton, sourceText_LabelWidget(item));
+                updateText_LabelWidget(dropButton,
+                                       replaceNewlinesWithDash_(text_LabelWidget(item)));
                 checkIcon_LabelWidget(dropButton);
             }
         }