5 files changed, 79 insertions, 22 deletions

diff --git a/src/ui/inputwidget.c b/src/ui/inputwidget.c
index a1fb8cb5..bd9b63b5 100644
--- a/src/ui/inputwidget.c
+++ b/src/ui/inputwidget.c
@@ -2343,10 +2343,29 @@ static void draw_InputWidget_(const iInputWidget *d) {
     /* If buffered, just draw the buffered copy. */
     if (d->buffered && !isFocused) {
         /* Most input widgets will use this, since only one is focused at a time. */
-        draw_TextBuf(d->buffered, addY_I2(drawPos, visLineOffsetY), white_ColorId);
+        if (flags_Widget(w) & alignRight_WidgetFlag) {
+            draw_TextBuf(
+                d->buffered,
+                addY_I2(init_I2(right_Rect(contentBounds) - d->buffered->size.x, drawPos.y),
+                        visLineOffsetY),
+                white_ColorId);
+        }
+        else {        
+            draw_TextBuf(d->buffered, addY_I2(drawPos, visLineOffsetY), white_ColorId);
+        }
     }
     else if (isHint) {
-        drawRange_Text(d->font, drawPos, uiAnnotation_ColorId, range_String(&d->hint));
+        if (flags_Widget(w) & alignRight_WidgetFlag) {
+            drawAlign_Text(d->font,
+                           init_I2(right_Rect(contentBounds), drawPos.y),
+                           uiAnnotation_ColorId,
+                           right_Alignment,
+                           "%s",
+                           cstr_String(&d->hint));
+        }
+        else {
+            drawRange_Text(d->font, drawPos, uiAnnotation_ColorId, range_String(&d->hint));
+        }
     }
     else {
         iAssert(~d->inFlags & isSensitive_InputWidgetFlag || size_Range(&visLines) == 1);
diff --git a/src/ui/labelwidget.c b/src/ui/labelwidget.c
index f6ddfd43..9ef62262 100644
--- a/src/ui/labelwidget.c
+++ b/src/ui/labelwidget.c
@@ -44,14 +44,15 @@ struct Impl_LabelWidget {
     iString command;
     iClick  click;
     struct {
-        uint8_t alignVisual         : 1; /* align according to visible bounds, not font metrics */
-        uint8_t noAutoMinHeight     : 1; /* minimum height is not set automatically */
-        uint8_t drawAsOutline       : 1; /* draw as outline, filled with background color */
-        uint8_t noTopFrame          : 1;
-        uint8_t wrap                : 1;
-        uint8_t allCaps             : 1;
-        uint8_t removeTrailingColon : 1;
-        uint8_t chevron             : 1;
+        uint16_t alignVisual         : 1; /* align according to visible bounds, not font metrics */
+        uint16_t noAutoMinHeight     : 1; /* minimum height is not set automatically */
+        uint16_t drawAsOutline       : 1; /* draw as outline, filled with background color */
+        uint16_t noTopFrame          : 1;
+        uint16_t wrap                : 1;
+        uint16_t allCaps             : 1;
+        uint16_t removeTrailingColon : 1;
+        uint16_t chevron             : 1;        
+        uint16_t checkMark           : 1;
     } flags;
 };
 
@@ -204,6 +205,9 @@ static void getColors_LabelWidget_(const iLabelWidget *d, int *bg, int *fg, int
     *bg     = isButton && ~flags & noBackground_WidgetFlag ? (d->widget.bgColor != none_ColorId ?
                                                               d->widget.bgColor : uiBackground_ColorId)
                                                            : none_ColorId;
+    if (d->flags.checkMark) {
+        *bg = none_ColorId;
+    }
     *fg     = uiText_ColorId;
     *frame1 = isButton ? uiEmboss1_ColorId : d->widget.frameColor;
     *frame2 = isButton ? uiEmboss2_ColorId : *frame1;
@@ -215,13 +219,15 @@ static void getColors_LabelWidget_(const iLabelWidget *d, int *bg, int *fg, int
         *meta = uiTextDisabled_ColorId;
     }
     if (isSel) {
-        *bg = uiBackgroundSelected_ColorId;
+        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 ;
+            if (!isKeyRoot) {
+                *bg = isDark_ColorTheme(colorTheme_App()) ? uiBackgroundUnfocusedSelection_ColorId
+                    : uiMarked_ColorId;
+            }
         }
         *fg = uiTextSelected_ColorId;
         if (isButton) {
@@ -429,14 +435,23 @@ static void draw_LabelWidget_(const iLabelWidget *d) {
             "%s",
             cstr_String(&d->label));
     }
-    if (d->flags.chevron) {
+    if (d->flags.chevron || (flags & selected_WidgetFlag && d->flags.checkMark)) {
         const iRect chRect = rect;
         const int chSize = lineHeight_Text(d->font);
+        int offset = 0;
+        if (d->flags.chevron) {
+            offset = -iconPad;
+        }
+        else {
+            offset = -10 * gap_UI;
+        }
         drawCentered_Text(d->font,
-                          (iRect){ addX_I2(topRight_Rect(chRect), -iconPad),
+                          (iRect){ addX_I2(topRight_Rect(chRect), offset),
                                    init_I2(chSize, height_Rect(chRect)) },
-                          iTrue, iconColor, rightAngle_Icon);
-    }
+                          iTrue,
+                          iconColor,
+                          d->flags.chevron ? rightAngle_Icon : check_Icon);
+    }    
     unsetClip_Paint(&p);
     drawChildren_Widget(w);
 }
@@ -580,6 +595,10 @@ void setChevron_LabelWidget(iLabelWidget *d, iBool chevron) {
     d->flags.chevron = chevron;
 }
 
+void setCheckMark_LabelWidget(iLabelWidget *d, iBool checkMark) {
+    d->flags.checkMark = checkMark;
+}
+
 void setWrap_LabelWidget(iLabelWidget *d, iBool wrap) {
     d->flags.wrap = wrap;
 }
diff --git a/src/ui/labelwidget.h b/src/ui/labelwidget.h
index 6542ae12..6f1b7902 100644
--- a/src/ui/labelwidget.h
+++ b/src/ui/labelwidget.h
@@ -33,6 +33,7 @@ void    setAlignVisually_LabelWidget(iLabelWidget *, iBool alignVisual);
 void    setNoAutoMinHeight_LabelWidget  (iLabelWidget *, iBool noAutoMinHeight);
 void    setNoTopFrame_LabelWidget   (iLabelWidget *, iBool noTopFrame);
 void    setChevron_LabelWidget      (iLabelWidget *, iBool chevron);
+void    setCheckMark_LabelWidget    (iLabelWidget *, iBool checkMark);
 void    setWrap_LabelWidget         (iLabelWidget *, iBool wrap);
 void    setOutline_LabelWidget      (iLabelWidget *, iBool drawAsOutline);
 void    setAllCaps_LabelWidget      (iLabelWidget *, iBool allCaps);
diff --git a/src/ui/mobile.c b/src/ui/mobile.c
index 7b34d389..c7b75d3f 100644
--- a/src/ui/mobile.c
+++ b/src/ui/mobile.c
@@ -511,6 +511,7 @@ void makePanelItem_Mobile(iWidget *panel, const iMenuItem *item) {
         setId_Widget(as_Widget(drop), id);
         widget = makeValuePaddingWithHeading_(heading = makeHeading_Widget(label), as_Widget(drop));
         setCommandHandler_Widget(widget, dropdownHeadingHandler_);
+        widget->padding[2] = gap_UI;
         setUserData_Object(widget, drop);
     }
     else if (equal_Command(spec, "radio") || equal_Command(spec, "buttons")) {
@@ -534,7 +535,20 @@ void makePanelItem_Mobile(iWidget *panel, const iMenuItem *item) {
                             resizeWidthOfChildren_WidgetFlag,
                         iTrue);
         setId_Widget(widget, id);
+        iBool isFirst = iTrue;
         for (const iMenuItem *radioItem = item->data; radioItem->label; radioItem++) {
+            if (!isHorizontal && !isFirst) {
+                /* The separator is padded from the left so we need two. */
+                iWidget *sep = new_Widget();
+                iWidget *sep2 = new_Widget();
+                addChildFlags_Widget(sep, iClob(sep2), 0);
+                setFlags_Widget(sep, arrangeHeight_WidgetFlag | resizeWidthOfChildren_WidgetFlag, iTrue);
+                setBackgroundColor_Widget(sep2, uiSeparator_ColorId);
+                setFixedSize_Widget(sep2, init_I2(-1, gap_UI / 4));
+                setPadding_Widget(sep, 5 * gap_UI, 0, 0, 0);
+                addChildFlags_Widget(widget, iClob(sep), 0);
+            }
+            isFirst = iFalse;
             const char *  radId = cstr_Rangecc(range_Command(radioItem->label, "id"));
             int64_t       flags = noBackground_WidgetFlag | frameless_WidgetFlag;
             if (!isHorizontal) {
@@ -554,10 +568,13 @@ void makePanelItem_Mobile(iWidget *panel, const iMenuItem *item) {
                 button = (iLabelWidget *) makeToggle_Widget(radId);
                 setTextCStr_LabelWidget(button, format_CStr("${%s}", radId));
                 setFlags_Widget(as_Widget(button), fixedWidth_WidgetFlag, iFalse);
-                updateSize_LabelWidget(button);
             }
             setId_Widget(as_Widget(button), radId);
             setFont_LabelWidget(button, isHorizontal ? uiLabelMedium_FontId : uiLabelBig_FontId);
+            setCheckMark_LabelWidget(button, !isHorizontal);
+            setPadding_Widget(as_Widget(button), gap_UI, 1 * gap_UI, 0, 1 * gap_UI);
+            updateSize_LabelWidget(button);
+            setPadding_Widget(widget, 0, 0, 0, 0);
             addChildFlags_Widget(widget, iClob(button), flags);
         }
     }
@@ -575,6 +592,7 @@ void makePanelItem_Mobile(iWidget *panel, const iMenuItem *item) {
             setFlags_Widget(widget, expand_WidgetFlag, iTrue);
         }
         else {
+            setFlags_Widget(as_Widget(input), alignRight_WidgetFlag, iTrue);
             setContentPadding_InputWidget(input, 3 * gap_UI, 0);
             if (hasLabel_Command(spec, "unit")) {
                 iWidget *unit = addChildFlags_Widget(
diff --git a/src/ui/uploadwidget.c b/src/ui/uploadwidget.c
index bad00071..c22bfe86 100644
--- a/src/ui/uploadwidget.c
+++ b/src/ui/uploadwidget.c
@@ -185,9 +185,9 @@ void init_UploadWidget(iUploadWidget *d) {
             { "label id:upload.info" },
             { "panel id:dlg.upload.text icon:0x1f5b9 noscroll:1", 0, 0, (const void *) textItems },
             { "panel id:dlg.upload.file icon:0x1f4c1", 0, 0, (const void *) fileItems },
-            { "padding" },
-            { "dropdown id:upload.id icon:0x1f464", 0, 0, constData_Array(makeIdentityItems_UploadWidget_(d)) },
-            { "input id:upload.token hint:hint.upload.token icon:0x1f511" },
+            { "heading text:${heading.upload.id}" },
+            { "dropdown id:upload.id icon:0x1f464 text:", 0, 0, constData_Array(makeIdentityItems_UploadWidget_(d)) },
+            { "input id:upload.token hint:hint.upload.token.long icon:0x1f516 text:" },
             { NULL }
         }, actions, iElemCount(actions));
         d->info          = findChild_Widget(w, "upload.info");