iOS: Adjusting the UI for a tablet screen

13 files changed, 184 insertions, 38 deletions

diff --git a/src/app.c b/src/app.c
index ae0633e5..3307d8dd 100644
--- a/src/app.c
+++ b/src/app.c
@@ -617,6 +617,11 @@ void processEvents_App(enum iAppEventMode eventMode) {
             SDL_WaitEvent(&ev)) ||
            ((!isWaitingAllowed_App_(d) || eventMode == postedEventsOnly_AppEventMode) &&
             SDL_PollEvent(&ev))) {
+#if defined (iPlatformAppleMobile)
+        if (processEvent_iOS(&ev)) {
+            continue;
+        }
+#endif
         switch (ev.type) {
             case SDL_QUIT:
                 d->isRunning = iFalse;
diff --git a/src/ios.h b/src/ios.h
index 09c514b0..90570e20 100644
--- a/src/ios.h
+++ b/src/ios.h
@@ -24,5 +24,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */
 
 #include "ui/util.h"
 
-void    setupApplication_iOS    (void);
+iDeclareType(Window)
 
+void    setupApplication_iOS    (void);
+void    setupWindow_iOS         (iWindow *window);
+iBool   processEvent_iOS        (const SDL_Event *);
diff --git a/src/ios.m b/src/ios.m
index 37f62b09..aca3bf0a 100644
--- a/src/ios.m
+++ b/src/ios.m
@@ -21,8 +21,14 @@ ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */
 
 #include "ios.h"
-
+#include "app.h"
+#include "ui/window.h"
 #include <SDL_events.h>
+#include <SDL_syswm.h>
+
+#import <UIKit/UIKit.h>
+
+static iBool isSystemDarkMode_ = iFalse;
 
 static void enableMouse_(iBool yes) {
     SDL_EventState(SDL_MOUSEBUTTONDOWN, yes);
@@ -33,3 +39,42 @@ static void enableMouse_(iBool yes) {
 void setupApplication_iOS(void) {
     enableMouse_(iFalse);
 }
+
+static UIViewController *viewController_(iWindow *window) {
+    SDL_SysWMinfo wm;
+    SDL_VERSION(&wm.version);
+    if (SDL_GetWindowWMInfo(window->win, &wm)) {
+        return wm.info.uikit.window.rootViewController;
+    }
+    iAssert(false);
+    return NULL;
+}
+
+static iBool isDarkMode_(iWindow *window) {
+    UIViewController *ctl = viewController_(window);
+    if (ctl) {
+        UITraitCollection *traits = ctl.traitCollection;
+        if (@available(iOS 12.0, *)) {
+            return (traits.userInterfaceStyle == UIUserInterfaceStyleDark);
+        }
+    }
+    return iFalse;
+}
+
+void setupWindow_iOS(iWindow *window) {
+    isSystemDarkMode_ = isDarkMode_(window);
+    postCommandf_App("~os.theme.changed dark:%d contrast:1", isSystemDarkMode_ ? 1 : 0);
+}
+
+iBool processEvent_iOS(const SDL_Event *ev) {
+    if (ev->type == SDL_WINDOWEVENT) {
+        if (ev->window.event == SDL_WINDOWEVENT_RESTORED) {
+            const iBool isDark = isDarkMode_(get_Window());
+            if (isDark != isSystemDarkMode_) {
+                isSystemDarkMode_ = isDark;
+                postCommandf_App("~os.theme.changed dark:%d contrast:1", isSystemDarkMode_ ? 1 : 0);
+            }
+        }
+    }
+    return iFalse; /* allow normal processing */
+}
diff --git a/src/ui/documentwidget.c b/src/ui/documentwidget.c
index 9619c56e..40d83cec 100644
--- a/src/ui/documentwidget.c
+++ b/src/ui/documentwidget.c
@@ -763,15 +763,19 @@ static void updateOutline_DocumentWidget_(iDocumentWidget *d) {
     }
 }
 
-static void setSource_DocumentWidget_(iDocumentWidget *d, const iString *source) {
-    setUrl_GmDocument(d->doc, d->mod.url);
-    setSource_GmDocument(d->doc, source, documentWidth_DocumentWidget_(d));
+static void documentRunsInvalidated_DocumentWidget_(iDocumentWidget *d) {
     d->foundMark       = iNullRange;
     d->selectMark      = iNullRange;
     d->hoverLink       = NULL;
     d->contextLink     = NULL;
     d->firstVisibleRun = NULL;
     d->lastVisibleRun  = NULL;
+}
+
+static void setSource_DocumentWidget_(iDocumentWidget *d, const iString *source) {
+    setUrl_GmDocument(d->doc, d->mod.url);
+    setSource_GmDocument(d->doc, source, documentWidth_DocumentWidget_(d));
+    documentRunsInvalidated_DocumentWidget_(d);
     setValue_Anim(&d->outlineOpacity, 0.0f, 0);
     updateWindowTitle_DocumentWidget_(d);
     updateVisible_DocumentWidget_(d);
@@ -1563,6 +1567,7 @@ static void updateDocumentWidthRetainingScrollPosition_DocumentWidget_(iDocument
         voffset = visibleRange_DocumentWidget_(d).start - top_Rect(run->visBounds);
     }
     setWidth_GmDocument(d->doc, documentWidth_DocumentWidget_(d));
+    documentRunsInvalidated_DocumentWidget_(d);
     if (runLoc && !keepCenter) {
         run = findRunAtLoc_GmDocument(d->doc, runLoc);
         if (run) {
diff --git a/src/ui/inputwidget.c b/src/ui/inputwidget.c
index 2f0fa064..9b36b057 100644
--- a/src/ui/inputwidget.c
+++ b/src/ui/inputwidget.c
@@ -121,6 +121,9 @@ void init_InputWidget(iInputWidget *d, size_t maxLen) {
     setMaxLen_InputWidget(d, maxLen);
     /* Caller must arrange the width, but the height is fixed. */
     w->rect.size.y = lineHeight_Text(default_FontId) + 2 * gap_UI;
+#if defined (iPlatformAppleMobile)
+    w->rect.size.y += 2 * gap_UI;
+#endif
     setFlags_Widget(w, fixedHeight_WidgetFlag, iTrue);
     init_Click(&d->click, d, SDL_BUTTON_LEFT);
     d->timer = 0;
diff --git a/src/ui/labelwidget.c b/src/ui/labelwidget.c
index d7e6c020..a0664433 100644
--- a/src/ui/labelwidget.c
+++ b/src/ui/labelwidget.c
@@ -28,8 +28,12 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */
 #include "util.h"
 #include "keys.h"
 
-iLocalDef iInt2 padding_(int flags) {
+iLocalDef iInt2 padding_(int64_t flags) {
+#if defined (iPlatformAppleMobile)
+    return init_I2(flags & tight_WidgetFlag ? 4 * gap_UI / 2 : (4 * gap_UI), 3 * gap_UI / 2);
+#else
     return init_I2(flags & tight_WidgetFlag ? 3 * gap_UI / 2 : (3 * gap_UI), gap_UI);
+#endif
 }
 
 struct Impl_LabelWidget {
@@ -83,6 +87,19 @@ static iBool processEvent_LabelWidget_(iLabelWidget *d, const SDL_Event *ev) {
         return iFalse;
     }
     if (!isEmpty_String(&d->command)) {
+#if 0 && defined (iPlatformAppleMobile)
+        /* Touch allows activating any button on release. */
+        switch (ev->type) {
+            case SDL_MOUSEBUTTONUP: {
+                const iInt2 mouse = init_I2(ev->button.x, ev->button.y);
+                if (contains_Widget(w, mouse)) {
+                    trigger_LabelWidget_(d);
+                    refresh_Widget(w);
+                }
+                break;
+            }
+        }
+#endif
         switch (processEvent_Click(&d->click, ev)) {
             case started_ClickResult:
                 setFlags_Widget(w, pressed_WidgetFlag, iTrue);
@@ -260,7 +277,7 @@ static void sizeChanged_LabelWidget_(iLabelWidget *d) {
 
 void updateSize_LabelWidget(iLabelWidget *d) {
     iWidget *w = as_Widget(d);
-    const int flags = flags_Widget(w);
+    const int64_t flags = flags_Widget(w);
     iInt2 size = add_I2(measure_Text(d->font, cstr_String(&d->label)), muli_I2(padding_(flags), 2));
     if ((flags & drawKey_WidgetFlag) && d->key) {
         iString str;
diff --git a/src/ui/lookupwidget.c b/src/ui/lookupwidget.c
index 123ac6c4..ab0a009a 100644
--- a/src/ui/lookupwidget.c
+++ b/src/ui/lookupwidget.c
@@ -377,6 +377,9 @@ void init_LookupWidget(iLookupWidget *d) {
     init_Widget(w);
     setId_Widget(w, "lookup");
     setFlags_Widget(w, focusable_WidgetFlag | resizeChildren_WidgetFlag, iTrue);
+#if defined (iPlatformAppleMobile)
+    setFlags_Widget(w, unhittable_WidgetFlag, iTrue);
+#endif
     d->list = addChild_Widget(w, iClob(new_ListWidget()));
     setItemHeight_ListWidget(d->list, lineHeight_Text(uiContent_FontId) * 1.25f);
     d->cursor = iInvalidPos;
@@ -639,6 +642,14 @@ static iBool processEvent_LookupWidget_(iLookupWidget *d, const SDL_Event *ev) {
         /* Position the lookup popup under the URL bar. */ {
             setSize_Widget(w, init_I2(width_Widget(findWidget_App("url")),
                                       get_Window()->root->rect.size.y / 2));
+#if defined (iPlatformAppleMobile)
+            /* TODO: Ask the system how tall the keyboard is. */ {
+                const iInt2 rootSize = rootSize_Window(get_Window());
+                if (rootSize.x > rootSize.y) {
+                    w->rect.size.y = rootSize.y * 4 / 10;
+                }
+            }
+#endif
             setPos_Widget(w, bottomLeft_Rect(bounds_Widget(findWidget_App("url"))));
             arrange_Widget(w);
         }
diff --git a/src/ui/sidebarwidget.c b/src/ui/sidebarwidget.c
index 32727703..5c6285fb 100644
--- a/src/ui/sidebarwidget.c
+++ b/src/ui/sidebarwidget.c
@@ -466,6 +466,9 @@ void init_SidebarWidget(iSidebarWidget *d, enum iSidebarSide side) {
     d->side = side;
     d->mode  = -1;
     d->width = 60 * gap_UI;
+#if defined (iPlatformAppleMobile)
+    d->width = 73 * gap_UI;
+#endif
     setFlags_Widget(w, fixedWidth_WidgetFlag, iTrue);
     d->maxButtonLabelWidth = 0;
     iWidget *vdiv = makeVDiv_Widget();
diff --git a/src/ui/text.c b/src/ui/text.c
index 7bb65bdc..e300e7c4 100644
--- a/src/ui/text.c
+++ b/src/ui/text.c
@@ -246,18 +246,23 @@ static void initFonts_Text_(iText *d) {
         h12Font = &fontLiterataBoldopsz36_Embedded;
         h3Font  = &fontLiterataRegularopsz14_Embedded;
     }
+#if defined (iPlatformAppleMobile)
+    const float uiSize = fontSize_UI * 1.1f;
+#else
+    const float uiSize = fontSize_UI;
+#endif
     const struct {
         const iBlock *ttf;
         int size;
         float scaling;
         int symbolsFont;
     } fontData[max_FontId] = {
-        { &fontSourceSansProRegular_Embedded, fontSize_UI,          1.0f, defaultSymbols_FontId },
-        { &fontSourceSansProBold_Embedded,    fontSize_UI,          1.0f, defaultSymbols_FontId },
-        { &fontSourceSansProRegular_Embedded, fontSize_UI * 1.125f, 1.0f, defaultMediumSymbols_FontId },
-        { &fontSourceSansProBold_Embedded,    fontSize_UI * 1.125f, 1.0f, defaultMediumSymbols_FontId },
-        { &fontSourceSansProRegular_Embedded, fontSize_UI * 1.666f, 1.0f, defaultLargeSymbols_FontId },
-        { &fontIosevkaTermExtended_Embedded,  fontSize_UI * 0.866f, 1.0f, defaultSymbols_FontId },
+        { &fontSourceSansProRegular_Embedded, uiSize,          1.0f, defaultSymbols_FontId },
+        { &fontSourceSansProBold_Embedded,    uiSize,          1.0f, defaultSymbols_FontId },
+        { &fontSourceSansProRegular_Embedded, uiSize * 1.125f, 1.0f, defaultMediumSymbols_FontId },
+        { &fontSourceSansProBold_Embedded,    uiSize * 1.125f, 1.0f, defaultMediumSymbols_FontId },
+        { &fontSourceSansProRegular_Embedded, uiSize * 1.666f, 1.0f, defaultLargeSymbols_FontId },
+        { &fontIosevkaTermExtended_Embedded,  uiSize * 0.866f, 1.0f, defaultSymbols_FontId },
         { &fontSourceSansProRegular_Embedded, textSize,             scaling, symbols_FontId },
         /* content fonts */
         { regularFont,                        textSize,             scaling,      symbols_FontId },
@@ -272,9 +277,9 @@ static void initFonts_Text_(iText *d) {
         /* monospace content fonts */
         { &fontIosevkaTermExtended_Embedded,  textSize,             0.866f, symbols_FontId },
         /* symbol fonts */
-        { &fontSymbola_Embedded,              fontSize_UI,          1.0f, defaultSymbols_FontId },
-        { &fontSymbola_Embedded,              fontSize_UI * 1.125f, 1.0f, defaultMediumSymbols_FontId },
-        { &fontSymbola_Embedded,              fontSize_UI * 1.666f, 1.0f, defaultLargeSymbols_FontId },
+        { &fontSymbola_Embedded,              uiSize,          1.0f, defaultSymbols_FontId },
+        { &fontSymbola_Embedded,              uiSize * 1.125f, 1.0f, defaultMediumSymbols_FontId },
+        { &fontSymbola_Embedded,              uiSize * 1.666f, 1.0f, defaultLargeSymbols_FontId },
         { &fontSymbola_Embedded,              textSize,             1.0f, symbols_FontId },
         { &fontSymbola_Embedded,              textSize * 1.200f,    1.0f, mediumSymbols_FontId },
         { &fontSymbola_Embedded,              textSize * 1.333f,    1.0f, bigSymbols_FontId },
@@ -283,9 +288,9 @@ static void initFonts_Text_(iText *d) {
         { &fontSymbola_Embedded,              monoSize,             1.0f, monospaceSymbols_FontId },
         { &fontSymbola_Embedded,              smallMonoSize,        1.0f, monospaceSmallSymbols_FontId },
         /* emoji fonts */
-        { &fontNotoEmojiRegular_Embedded,     fontSize_UI,          1.0f, defaultSymbols_FontId },
-        { &fontNotoEmojiRegular_Embedded,     fontSize_UI * 1.125f, 1.0f, defaultMediumSymbols_FontId },
-        { &fontNotoEmojiRegular_Embedded,     fontSize_UI * 1.666f, 1.0f, defaultLargeSymbols_FontId },
+        { &fontNotoEmojiRegular_Embedded,     uiSize,          1.0f, defaultSymbols_FontId },
+        { &fontNotoEmojiRegular_Embedded,     uiSize * 1.125f, 1.0f, defaultMediumSymbols_FontId },
+        { &fontNotoEmojiRegular_Embedded,     uiSize * 1.666f, 1.0f, defaultLargeSymbols_FontId },
         { &fontNotoEmojiRegular_Embedded,     textSize,             1.0f, symbols_FontId },
         { &fontNotoEmojiRegular_Embedded,     textSize * 1.200f,    1.0f, mediumSymbols_FontId },
         { &fontNotoEmojiRegular_Embedded,     textSize * 1.333f,    1.0f, bigSymbols_FontId },
@@ -294,7 +299,7 @@ static void initFonts_Text_(iText *d) {
         { &fontNotoEmojiRegular_Embedded,     monoSize,             1.0f, monospaceSymbols_FontId },
         { &fontNotoEmojiRegular_Embedded,     smallMonoSize,        1.0f, monospaceSmallSymbols_FontId },
         /* japanese fonts */
-        { &fontNotoSansJPRegular_Embedded,    fontSize_UI,          1.0f, defaultSymbols_FontId },
+        { &fontNotoSansJPRegular_Embedded,    uiSize,          1.0f, defaultSymbols_FontId },
         { &fontNotoSansJPRegular_Embedded,    smallMonoSize,        1.0f, monospaceSmallSymbols_FontId },
         { &fontNotoSansJPRegular_Embedded,    monoSize,             1.0f, monospaceSymbols_FontId },
         { &fontNotoSansJPRegular_Embedded,    textSize,             1.0f, symbols_FontId },
@@ -303,7 +308,7 @@ static void initFonts_Text_(iText *d) {
         { &fontNotoSansJPRegular_Embedded,    textSize * 1.666f,    1.0f, largeSymbols_FontId },
         { &fontNotoSansJPRegular_Embedded,    textSize * 2.000f,    1.0f, hugeSymbols_FontId },
         /* korean fonts */
-        { &fontNanumGothicRegular_Embedded,   fontSize_UI,          1.0f, defaultSymbols_FontId },
+        { &fontNanumGothicRegular_Embedded,   uiSize,          1.0f, defaultSymbols_FontId },
         { &fontNanumGothicRegular_Embedded,   smallMonoSize,        1.0f, monospaceSmallSymbols_FontId },
         { &fontNanumGothicRegular_Embedded,   monoSize,             1.0f, monospaceSymbols_FontId },
         { &fontNanumGothicRegular_Embedded,   textSize,             1.0f, symbols_FontId },
diff --git a/src/ui/touch.c b/src/ui/touch.c
index 9b47d0fe..d7d2bca1 100644
--- a/src/ui/touch.c
+++ b/src/ui/touch.c
@@ -187,6 +187,19 @@ static void update_TouchState_(void *ptr) {
     }
 }
 
+static void dispatchButtonUp_Touch_(iFloat3 pos) {
+    dispatchEvent_Widget(get_Window()->root, (SDL_Event *) &(SDL_MouseButtonEvent){
+        .type = SDL_MOUSEBUTTONUP,
+        .timestamp = SDL_GetTicks(),
+        .clicks = 1,
+        .state = SDL_RELEASED,
+        .which = SDL_TOUCH_MOUSEID,
+        .button = SDL_BUTTON_LEFT,
+        .x = x_F3(pos),
+        .y = y_F3(pos)
+    });
+}
+
 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) {
@@ -258,6 +271,13 @@ iBool processEvent_Touch(const SDL_Event *ev) {
                 });
                 return iTrue;
             }
+            /*dispatchEvent_Widget(window->root, (SDL_Event *) &(SDL_MouseMotionEvent){
+                .type = SDL_MOUSEMOTION,
+                .timestamp = fing->timestamp,
+                .which = SDL_TOUCH_MOUSEID,
+                .x = x_F3(pos),
+                .y = y_F3(pos)
+            });*/
             /* Update touch position. */
             pushPos_Touch_(touch, pos, nowTime);
             const iFloat3 amount = add_F3(touch->remainder,
@@ -304,16 +324,7 @@ iBool processEvent_Touch(const SDL_Event *ev) {
                 continue;
             }
             if (flags_Widget(touch->affinity) & touchDrag_WidgetFlag) {
-                dispatchEvent_Widget(window->root, (SDL_Event *) &(SDL_MouseButtonEvent){
-                    .type = SDL_MOUSEBUTTONUP,
-                    .timestamp = fing->timestamp,
-                    .clicks = 1,
-                    .state = SDL_RELEASED,
-                    .which = SDL_TOUCH_MOUSEID,
-                    .button = SDL_BUTTON_LEFT,
-                    .x = x_F3(pos),
-                    .y = y_F3(pos)
-                });
+                dispatchButtonUp_Touch_(pos);
                 remove_ArrayIterator(&i);
                 continue;
             }
@@ -357,6 +368,9 @@ iBool processEvent_Touch(const SDL_Event *ev) {
                     }
                     pushBack_Array(d->moms, &mom);
                 }
+                else {
+                    dispatchButtonUp_Touch_(pos);
+                }
             }
             remove_ArrayIterator(&i);
         }
diff --git a/src/ui/util.c b/src/ui/util.c
index 553d9078..850ca818 100644
--- a/src/ui/util.c
+++ b/src/ui/util.c
@@ -463,12 +463,23 @@ void openMenu_Widget(iWidget *d, iInt2 coord) {
     arrange_Widget(d);
     d->rect.pos = coord;
     /* Ensure the full menu is visible. */
-    const iInt2 rootSize     = rootSize_Window(get_Window());
+    const iInt2 rootSize = rootSize_Window(get_Window());
+#if defined (iPlatformAppleMobile)
+    /* Move out from under the user's hand/finger. */
+    if (!parentMenuButton_(d)) {
+        const float normX = (float) left_Rect(bounds_Widget(d)) / rootSize.x;
+        subv_I2(&d->rect.pos, init_I2(normX * width_Rect(d->rect), height_Rect(d->rect)));
+    }
+#endif
     const iRect bounds       = bounds_Widget(d);
     const int   leftExcess   = -left_Rect(bounds);
     const int   rightExcess  = right_Rect(bounds) - rootSize.x;
-    const int   topExcess    = -top_Rect(bounds);
+    int         topExcess    = -top_Rect(bounds);
     const int   bottomExcess = bottom_Rect(bounds) - rootSize.y;
+#if defined (iPlatformAppleMobile)
+    /* Reserve space for the system status bar. */
+    topExcess += 4.5 * gap_UI;
+#endif
     if (bottomExcess > 0) {
         d->rect.pos.y -= bottomExcess;
     }
diff --git a/src/ui/widget.c b/src/ui/widget.c
index 5afb004f..331192f9 100644
--- a/src/ui/widget.c
+++ b/src/ui/widget.c
@@ -734,9 +734,19 @@ iAny *hitChild_Widget(const iWidget *d, iInt2 coord) {
     if (d->flags & unhittable_WidgetFlag) {
         return NULL;
     }
-    iConstForEach(ObjectList, i, d->children) {
-        iAny *found = hitChild_Widget(constAs_Widget(i.object), coord);
-        if (found) return found;
+    /* Check for on-top widgets first. */
+    if (!d->parent) {
+        iForEach(PtrArray, i, onTop_RootData_()) {
+            iAny *found = hitChild_Widget(constAs_Widget(i.ptr), coord);
+            if (found) return found;
+        }
+    }
+    iForEach(ObjectList, i, d->children) {
+        const iWidget *child = constAs_Widget(i.object);
+        if (~child->flags & keepOnTop_WidgetFlag) {
+            iAny *found = hitChild_Widget(child, coord);
+            if (found) return found;
+        }
     }
     if (contains_Widget(d, coord)) {
         return iConstCast(iWidget *, d);
diff --git a/src/ui/window.c b/src/ui/window.c
index d64e7ebf..75dffb56 100644
--- a/src/ui/window.c
+++ b/src/ui/window.c
@@ -45,6 +45,9 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */
 #if defined (iPlatformAppleDesktop)
 #   include "macos.h"
 #endif
+#if defined (iPlatformAppleMobile)
+#   include "ios.h"
+#endif
 
 #include <the_Foundation/file.h>
 #include <the_Foundation/path.h>
@@ -562,6 +565,11 @@ static void setupUserInterface_Window(iWindow *d) {
     iWidget *div = makeVDiv_Widget();
     setId_Widget(div, "navdiv");
     addChild_Widget(d->root, iClob(div));
+    
+#if defined (iPlatformAppleMobile)
+    /* System status bar needs space. */
+    setPadding_Widget(div, 0, 4 * gap_UI, 0, 0);
+#endif
 
 #if defined (LAGRANGE_CUSTOM_FRAME)
     /* Window title bar. */ 
@@ -650,7 +658,7 @@ static void setupUserInterface_Window(iWindow *d) {
             setNotifyEdits_InputWidget(url, iTrue);
             setTextCStr_InputWidget(url, "gemini://");
             addChildFlags_Widget(navBar, iClob(url), expand_WidgetFlag);
-            setPadding_Widget(as_Widget(url),0, 0, gap_UI * 1, 0);
+            setPadding_Widget(as_Widget(url), 0, 0, gap_UI * 1, 0);
             /* Feeds refresh indicator is inside the input field. */ {
                 iLabelWidget *fprog = new_LabelWidget(uiTextCaution_ColorEscape
                                                       "\u2605 Refreshing Feeds...", NULL);
@@ -980,6 +988,9 @@ void init_Window(iWindow *d, iRect rect) {
         SDL_FreeSurface(surf);
     }
 #endif
+#if defined (iPlatformAppleMobile)
+    setupWindow_iOS(d);
+#endif
     d->root = new_Widget();
     setFlags_Widget(d->root, focusRoot_WidgetFlag, iTrue);
     d->presentTime = 0.0;
@@ -1175,7 +1186,6 @@ static iBool handleWindowEvent_Window_(iWindow *d, const SDL_WindowEvent *ev) {
             //updateRootSize_Window_(d, iTrue);
             invalidate_Window_(d);
             d->isMinimized = iFalse;
-            printf("restored %d\n", snap_Window(d)); fflush(stdout);
             return iTrue;
         case SDL_WINDOWEVENT_MINIMIZED:
             d->isMinimized = iTrue;
@@ -1316,10 +1326,14 @@ void draw_Window(iWindow *d) {
     const iBool gotFocus = (winFlags & SDL_WINDOW_INPUT_FOCUS) != 0;
     /* Clear the window. The clear color is visible as a border around the window
        when the custom frame is being used. */ {
+#if defined (iPlatformAppleMobile)
+        const iColor back = get_Color(uiBackground_ColorId);
+#else
         const iColor back = get_Color(gotFocus && d->place.snap != maximized_WindowSnap &&
                                               ~winFlags & SDL_WINDOW_FULLSCREEN_DESKTOP
                                           ? uiAnnotation_ColorId
                                           : uiSeparator_ColorId);
+#endif
         SDL_SetRenderDrawColor(d->render, back.r, back.g, back.b, 255);
         SDL_RenderClear(d->render);
     }