5 files changed, 62 insertions, 4 deletions

diff --git a/src/ui/documentwidget.c b/src/ui/documentwidget.c
index 0fa9b3f7..9b412783 100644
--- a/src/ui/documentwidget.c
+++ b/src/ui/documentwidget.c
@@ -2495,11 +2495,17 @@ static iBool processEvent_DocumentWidget_(iDocumentWidget *d, const SDL_Event *e
                             (iMenuItem[]){ { "Copy", 0, 0, "copy" }, { "---", 0, 0, NULL } },
                             2);
                     }
+                    if (deviceType_App() == desktop_AppDeviceType) {
+                        pushBackN_Array(
+                            &items,
+                            (iMenuItem[]){
+                                { "Go Back", navigateBack_KeyShortcut, "navigate.back" },
+                            { "Go Forward", navigateForward_KeyShortcut, "navigate.forward" } },
+                        2);
+                    }
                     pushBackN_Array(
                         &items,
                         (iMenuItem[]){
-                            { "Go Back", navigateBack_KeyShortcut, "navigate.back" },
-                            { "Go Forward", navigateForward_KeyShortcut, "navigate.forward" },
                             { upArrow_Icon " Go to Parent", navigateParent_KeyShortcut, "navigate.parent" },
                             { upArrowBar_Icon " Go to Root", navigateRoot_KeyShortcut, "navigate.root" },
                             { "---", 0, 0, NULL },
@@ -2512,7 +2518,7 @@ static iBool processEvent_DocumentWidget_(iDocumentWidget *d, const SDL_Event *e
                             { book_Icon " Import Links as Bookmarks...", 0, 0, "bookmark.links confirm:1" },
                             { "---", 0, 0, NULL },
                             { "Copy Page URL", 0, 0, "document.copylink" } },
-                        13);
+                        11);
                     if (isEmpty_Range(&d->selectMark)) {
                         pushBackN_Array(
                             &items,
diff --git a/src/ui/inputwidget.c b/src/ui/inputwidget.c
index 11ea0674..267ccdf7 100644
--- a/src/ui/inputwidget.c
+++ b/src/ui/inputwidget.c
@@ -165,6 +165,11 @@ void deinit_InputWidget(iInputWidget *d) {
     deinit_Array(&d->text);
 }
 
+void setFont_InputWidget(iInputWidget *d, int fontId) {
+    d->font = fontId;
+    updateMetrics_InputWidget_(d);
+}
+
 static void pushUndo_InputWidget_(iInputWidget *d) {
     iInputUndo undo;
     init_InputUndo_(&undo, &d->text, d->cursor);
diff --git a/src/ui/inputwidget.h b/src/ui/inputwidget.h
index 3c7b2ffb..fc768e05 100644
--- a/src/ui/inputwidget.h
+++ b/src/ui/inputwidget.h
@@ -37,6 +37,7 @@ void    setMode_InputWidget     (iInputWidget *, enum iInputMode mode);
 void    setMaxLen_InputWidget   (iInputWidget *, size_t maxLen);
 void    setText_InputWidget     (iInputWidget *, const iString *text);
 void    setTextCStr_InputWidget (iInputWidget *, const char *cstr);
+void    setFont_InputWidget     (iInputWidget *, int fontId);
 void    setCursor_InputWidget   (iInputWidget *, size_t pos);
 void    setContentPadding_InputWidget   (iInputWidget *, int left, int right); /* only affects the text entry */
 void    begin_InputWidget       (iInputWidget *);
diff --git a/src/ui/touch.c b/src/ui/touch.c
index e3c7b9a1..27db0073 100644
--- a/src/ui/touch.c
+++ b/src/ui/touch.c
@@ -245,6 +245,16 @@ static void dispatchButtonUp_Touch_(iFloat3 pos) {
     });
 }
 
+static iWidget *findOverflowScrollable_Widget_(iWidget *d) {
+    const iInt2 rootSize = rootSize_Window(get_Window());
+    for (iWidget *w = d; w; w = parent_Widget(w)) {
+        if (flags_Widget(w) & overflowScrollable_WidgetFlag && height_Widget(w) > rootSize.y) {
+            return w;
+        }
+    }
+    return NULL;
+}
+
 iBool processEvent_Touch(const SDL_Event *ev) {
     /* We only handle finger events here. */
     if (ev->type != SDL_FINGERDOWN && ev->type != SDL_FINGERMOTION && ev->type != SDL_FINGERUP) {
@@ -329,6 +339,11 @@ iBool processEvent_Touch(const SDL_Event *ev) {
                        the first one. */
                     divvf_F3(&touch->accum, 6);
                     divfv_I2(&pixels, 6);
+                    /* Allow scrolling a scrollable widget. */
+                    iWidget *flow = findOverflowScrollable_Widget_(touch->affinity);
+                    if (flow) {
+                        touch->affinity = flow;
+                    }
                 }
                 else {
                     touch->accum = zero_F3();
@@ -367,6 +382,7 @@ iBool processEvent_Touch(const SDL_Event *ev) {
 //                   class_Widget(touch->affinity)->name,
 //                   pixels.y, y_F3(amount), y_F3(touch->accum));
             if (pixels.x || pixels.y) {
+                setFocus_Widget(NULL);
                 dispatchMotion_Touch_(pos, 0);
                 dispatchEvent_Widget(touch->affinity, (SDL_Event *) &(SDL_MouseWheelEvent){
                     .type = SDL_MOUSEWHEEL,
diff --git a/src/ui/util.c b/src/ui/util.c
index df44cc80..29ac04a3 100644
--- a/src/ui/util.c
+++ b/src/ui/util.c
@@ -359,7 +359,7 @@ iWidget *makePadding_Widget(int size) {
 
 iLabelWidget *makeHeading_Widget(const char *text) {
     iLabelWidget *heading = new_LabelWidget(text, NULL);
-    setFlags_Widget(as_Widget(heading), frameless_WidgetFlag | fixedSize_WidgetFlag, iTrue);
+    setFlags_Widget(as_Widget(heading), frameless_WidgetFlag | alignLeft_WidgetFlag /*| fixedSize_WidgetFlag*/, iTrue);
     setBackgroundColor_Widget(as_Widget(heading), none_ColorId);
     return heading;
 }
@@ -931,14 +931,32 @@ void finalizeSheet_Widget(iWidget *sheet) {
                 iWidget *value   = child_Widget(values, 0);
                 removeChild_Widget(headings, heading);
                 removeChild_Widget(values, value);
+                iLabelWidget *headingLabel = NULL;
                 iLabelWidget *valueLabel = NULL;
+                iInputWidget *valueInput = NULL;
+                if (isInstance_Object(heading, &Class_LabelWidget)) {
+                    headingLabel = (iLabelWidget *) heading;
+                }
                 if (isInstance_Object(value, &Class_LabelWidget)) {
                     valueLabel = (iLabelWidget *) value;
                 }
+                if (isInstance_Object(value, &Class_InputWidget)) {
+                    valueInput = (iInputWidget *) value;
+                }
+                if (valueLabel) {
+                    setFont_LabelWidget(valueLabel, defaultBig_FontId);
+                }
+                if (valueInput) {
+                    setFont_InputWidget(valueInput, defaultBig_FontId);
+                    setContentPadding_InputWidget(valueInput, 3 * gap_UI, 3 * gap_UI);
+                }
                 /* Toggles have the button on the right. */
                 if (valueLabel && cmp_String(command_LabelWidget(valueLabel), "toggle") == 0) {
                     iWidget *div = new_Widget();
+                    setFrameColor_Widget(div, uiSeparator_ColorId);
+                    setPadding_Widget(div, gap_UI, gap_UI, 4 * gap_UI, gap_UI);
                     addChildFlags_Widget(div, iClob(heading), 0);
+                    setFont_LabelWidget((iLabelWidget *) heading, defaultBig_FontId);
                     addChildFlags_Widget(div, iClob(new_Widget()), expand_WidgetFlag);
                     addChild_Widget(div, iClob(value));
                     addChildFlags_Widget(sheet,
@@ -952,9 +970,15 @@ void finalizeSheet_Widget(iWidget *sheet) {
                         /* Subheading padding goes above. */
                         addChild_Widget(sheet, iClob(value));
                         addChild_Widget(sheet, iClob(heading));
+                        setFont_LabelWidget(headingLabel, uiLabelBold_FontId);
                     }
                     else {
                         addChild_Widget(sheet, iClob(heading));
+                        if (headingLabel) {
+                            setTextColor_LabelWidget(headingLabel, uiSubheading_ColorId);
+                            setText_LabelWidget(headingLabel,
+                                                collect_String(upper_String(text_LabelWidget(headingLabel))));
+                        }
                         addChild_Widget(sheet, iClob(value));
                         /* Align radio buttons to the right. */
                         if (childCount_Widget(value)) {
@@ -962,6 +986,12 @@ void finalizeSheet_Widget(iWidget *sheet) {
                                             resizeToParentWidth_WidgetFlag |
                                             resizeWidthOfChildren_WidgetFlag,
                                             iTrue);
+                            iForEach(ObjectList, sub, children_Widget(value)) {
+                                if (isInstance_Object(sub.object, &Class_LabelWidget)) {
+                                    iLabelWidget *opt = sub.object;
+                                    setFont_LabelWidget(opt, defaultBig_FontId);
+                                }
+                            }
                         }
                     }
                 }