14 files changed, 129 insertions, 54 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index ffb34d9c..98fd29fa 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -22,8 +22,11 @@ project (Lagrange
     DESCRIPTION "A Beautiful Gemini Client"
     LANGUAGES C
 )
-set (IOS_BUNDLE_VERSION 6)
 set (COPYRIGHT_YEAR 2021)
+if (IOS)
+    set (PROJECT_VERSION 1.4)  # pinned for TestFlight
+    set (IOS_BUNDLE_VERSION 7) # just increment this
+endif ()
 
 # Build configuration.
 option (ENABLE_IPC              "Use IPC to communicate between running instances" ON)
diff --git a/src/app.c b/src/app.c
index 6d172c02..b80953a1 100644
--- a/src/app.c
+++ b/src/app.c
@@ -146,6 +146,7 @@ iDeclareType(Ticker)
 
 struct Impl_Ticker {
     iAny *context;
+    iRoot *root;
     void (*callback)(iAny *);
 };
 
@@ -411,15 +412,17 @@ static iBool loadState_App_(iApp *d) {
                 const uint8_t rootIndex = bits & 0xff;
                 const uint8_t flags     = bits >> 8;
                 iRoot *root = d->window->roots[rootIndex];
-                if (root && deviceType_App() != phone_AppDeviceType) {
+                if (root) {
                     iSidebarWidget *sidebar  = findChild_Widget(root->widget, "sidebar");
                     iSidebarWidget *sidebar2 = findChild_Widget(root->widget, "sidebar2");
-                    setWidth_SidebarWidget(sidebar,  widths[0]);
-                    setWidth_SidebarWidget(sidebar2, widths[1]);
                     postCommandf_Root(root, "sidebar.mode arg:%u", modes & 0xf);
                     postCommandf_Root(root, "sidebar2.mode arg:%u", modes >> 4);
-                    if (flags & 1) postCommand_Root(root, "sidebar.toggle");
-                    if (flags & 2) postCommand_Root(root, "sidebar2.toggle");
+                    if (deviceType_App() != phone_AppDeviceType) {
+                        setWidth_SidebarWidget(sidebar,  widths[0]);
+                        setWidth_SidebarWidget(sidebar2, widths[1]);
+                        if (flags & 1) postCommand_Root(root, "sidebar.toggle");
+                        if (flags & 2) postCommand_Root(root, "sidebar2.toggle");
+                    }
                 }
             }
             else if (!memcmp(magic, magicTabDocument_App_, 4)) {
@@ -776,6 +779,10 @@ static void init_App_(iApp *d, int argc, char **argv) {
         iRelease(openCmds);
     }
     fetchRemote_Bookmarks(d->bookmarks);
+    if (deviceType_App() != desktop_AppDeviceType) {
+        /* HACK: Force a resize so widgets update their state. */
+        resize_Window(d->window, -1, -1);
+    }
 }
 
 static void deinit_App(iApp *d) {
@@ -1175,7 +1182,7 @@ static void runTickers_App_(iApp *d) {
     iConstForEach(Array, i, &pending->values) {
         const iTicker *ticker = i.value;
         if (ticker->callback) {
-            setCurrent_Root(findRoot_Window(d->window, ticker->context)); /* root might be NULL */
+            setCurrent_Root(ticker->root); /* root might be NULL */
             ticker->callback(ticker->context);
         }
     }
@@ -1406,13 +1413,19 @@ iAny *findWidget_App(const char *id) {
 
 void addTicker_App(iTickerFunc ticker, iAny *context) {
     iApp *d = &app_;
-    insert_SortedArray(&d->tickers, &(iTicker){ context, ticker });
+    insert_SortedArray(&d->tickers, &(iTicker){ context, get_Root(), ticker });
+    postRefresh_App();
+}
+
+void addTickerRoot_App(iTickerFunc ticker, iRoot *root, iAny *context) {
+    iApp *d = &app_;
+    insert_SortedArray(&d->tickers, &(iTicker){ context, root, ticker });
     postRefresh_App();
 }
 
 void removeTicker_App(iTickerFunc ticker, iAny *context) {
     iApp *d = &app_;
-    remove_SortedArray(&d->tickers, &(iTicker){ context, ticker });
+    remove_SortedArray(&d->tickers, &(iTicker){ context, NULL, ticker });
 }
 
 iMimeHooks *mimeHooks_App(void) {
diff --git a/src/app.h b/src/app.h
index aa647bfb..0fb6be29 100644
--- a/src/app.h
+++ b/src/app.h
@@ -110,6 +110,7 @@ typedef void (*iTickerFunc)(iAny *);
 
 iAny *      findWidget_App      (const char *id);
 void        addTicker_App       (iTickerFunc ticker, iAny *context);
+void        addTickerRoot_App   (iTickerFunc ticker, iRoot *root, iAny *context);
 void        removeTicker_App    (iTickerFunc ticker, iAny *context);
 void        postRefresh_App     (void);
 void        postImmediateRefresh_App(void);
diff --git a/src/ios.m b/src/ios.m
index 6e2fa64b..7f2751e0 100644
--- a/src/ios.m
+++ b/src/ios.m
@@ -196,7 +196,7 @@ didPickDocumentsAtURLs:(NSArray<NSURL *> *)urls {
     CGRect keyboardFrame = [view convertRect:rawFrame fromView:nil];
 //    NSLog(@"keyboardFrame: %@", NSStringFromCGRect(keyboardFrame));
     iWindow *window = get_Window();
-    const iInt2 rootSize = rootSize_Window(window);
+    const iInt2 rootSize = size_Root(window->roots[0]);
     const int keyTop = keyboardFrame.origin.y * window->pixelRatio;
     setKeyboardHeight_Window(window, rootSize.y - keyTop);
 }
diff --git a/src/ui/documentwidget.c b/src/ui/documentwidget.c
index d2a97371..23731105 100644
--- a/src/ui/documentwidget.c
+++ b/src/ui/documentwidget.c
@@ -1444,7 +1444,8 @@ static void scrollBegan_DocumentWidget_(iAnyObject *any, int offset, uint32_t du
     }
     /* Show and hide toolbar on scroll. */
     if (deviceType_App() == phone_AppDeviceType) {
-        if (prefs_App()->hideToolbarOnScroll && iAbs(offset) > 5) {
+        if (prefs_App()->hideToolbarOnScroll && iAbs(offset) > 5 &&
+            normScrollPos_DocumentWidget_(d) > 0) {
             showToolbars_Root(as_Widget(d)->root, offset < 0);
         }
     }
@@ -1584,6 +1585,7 @@ static void inputQueryValidator_(iInputWidget *input, void *context) {
                              avail < 128 ? uiTextStrong_ColorId
                                          : uiTextDim_ColorId);
     delete_String(url);
+    arrange_Widget(findChild_Widget(dlg, "dialogbuttons"));
 }
 
 static void checkResponse_DocumentWidget_(iDocumentWidget *d) {
@@ -1616,16 +1618,27 @@ static void checkResponse_DocumentWidget_(iDocumentWidget *d) {
                     uiTextCaution_ColorEscape "${dlg.input.send}",
                     format_CStr("!document.input.submit doc:%p", d));
                 iWidget *buttons = findChild_Widget(dlg, "dialogbuttons");
-                iLabelWidget *lineBreak =
-                    insertChildAfter_Widget(buttons, iClob(new_LabelWidget("${dlg.input.linebreak}"
-                                                                           uiTextAction_ColorEscape
-                                                                           "  " shiftReturn_Icon,
-                                                                           NULL)), 0);
+                iLabelWidget *lineBreak;
+                /* The line break and URL length counters are positioned differently on mobile. */
+                if (deviceType_App() == desktop_AppDeviceType) {
+                    lineBreak = new_LabelWidget("${dlg.input.linebreak}"
+                                                uiTextAction_ColorEscape
+                                                "  " shiftReturn_Icon,
+                                                NULL);
+                    insertChildAfter_Widget(buttons, iClob(lineBreak), 0);
+                }
+                else {
+                    lineBreak = new_LabelWidget("${dlg.input.linebreak}", "text.insert arg:10");
+                }
+                setFlags_Widget(as_Widget(lineBreak), frameless_WidgetFlag, iTrue);
                 setTextColor_LabelWidget(lineBreak, uiTextDim_ColorId);
                 setId_Widget(addChildPosFlags_Widget(buttons,
                                                      iClob(new_LabelWidget("", NULL)),
                                                      front_WidgetAddPos, frameless_WidgetFlag),
                              "valueinput.counter");
+                if (deviceType_App() != desktop_AppDeviceType) {
+                    addChildPos_Widget(buttons, iClob(lineBreak), front_WidgetAddPos);
+                }
                 setValidator_InputWidget(findChild_Widget(dlg, "input"), inputQueryValidator_, d);
                 setSensitiveContent_InputWidget(findChild_Widget(dlg, "input"),
                                                 statusCode == sensitiveInput_GmStatusCode);
diff --git a/src/ui/inputwidget.c b/src/ui/inputwidget.c
index d9985a8b..59bb8331 100644
--- a/src/ui/inputwidget.c
+++ b/src/ui/inputwidget.c
@@ -156,6 +156,9 @@ static iRect contentBounds_InputWidget_(const iInputWidget *d) {
                                  neg_I2(addX_I2(padding_(), d->rightPadding)));
     shrink_Rect(&bounds, init_I2(gap_UI * (flags_Widget(w) & tight_WidgetFlag ? 1 : 2), 0));
     bounds.pos.y += padding_().y / 2;
+    if (flags_Widget(w) & extraPadding_WidgetFlag) {
+        bounds.pos.y += gap_UI;
+    }
     return bounds;
 }
 
@@ -955,6 +958,9 @@ static iRect bounds_InputWidget_(const iInputWidget *d) {
         return bounds;
     }
     bounds.size.y = contentHeight_InputWidget_(d, iFalse) + 3 * padding_().y;
+    if (w->flags & extraPadding_WidgetFlag) {
+        bounds.size.y += 2 * gap_UI;
+    }
     return bounds;
 }
 
@@ -1006,6 +1012,13 @@ static iBool processEvent_InputWidget_(iInputWidget *d, const SDL_Event *ev) {
         }
         return iFalse;
     }
+    else if (isCommand_UserEvent(ev, "text.insert")) {
+        pushUndo_InputWidget_(d);
+        deleteMarked_InputWidget_(d);
+        insertChar_InputWidget_(d, arg_Command(command_UserEvent(ev)));
+        contentsWereChanged_InputWidget_(d);
+        return iTrue;
+    }
     else if (isMetricsChange_UserEvent(ev)) {
         updateMetrics_InputWidget_(d);
         updateLinesAndResize_InputWidget_(d);
@@ -1351,7 +1364,8 @@ static void draw_InputWidget_(const iInputWidget *d) {
                             isFocused ? gap_UI / 4 : 1,
                             isFocused ? uiInputFrameFocused_ColorId
                                       : isHover ? uiInputFrameHover_ColorId : uiInputFrame_ColorId);
-    setClip_Paint(&p, adjusted_Rect(bounds, init_I2(d->leftPadding, 0), init_I2(-d->rightPadding, 0)));
+    setClip_Paint(&p, adjusted_Rect(bounds, init_I2(d->leftPadding, 0),
+                                    init_I2(-d->rightPadding, w->flags & extraPadding_WidgetFlag ? -gap_UI / 2 : 0)));
     const iRect contentBounds = contentBounds_InputWidget_(d);
 //    const iInt2 textOrigin = textOrigin_InputWidget_(d); //, cstr_String(text));
     iInt2       drawPos    = topLeft_Rect(contentBounds);
diff --git a/src/ui/lookupwidget.c b/src/ui/lookupwidget.c
index b06523f9..3eafd4bd 100644
--- a/src/ui/lookupwidget.c
+++ b/src/ui/lookupwidget.c
@@ -662,7 +662,7 @@ static iBool processEvent_LookupWidget_(iLookupWidget *d, const SDL_Event *ev) {
             setPos_Widget(w, windowToLocal_Widget(w, bottomLeft_Rect(bounds_Widget(url))));
 #if defined (iPlatformAppleMobile)
             /* Adjust height based on keyboard size. */ {
-                w->rect.size.y = visibleRootSize_Window(window).y - top_Rect(bounds_Widget(w));
+                w->rect.size.y = visibleSize_Root(root).y - top_Rect(bounds_Widget(w));
                 if (deviceType_App() == phone_AppDeviceType) {
                     float l, r;
                     safeAreaInsets_iOS(&l, NULL, &r, NULL);
diff --git a/src/ui/root.c b/src/ui/root.c
index 76ef05c4..233de51c 100644
--- a/src/ui/root.c
+++ b/src/ui/root.c
@@ -269,6 +269,7 @@ iAnyObject *findWidget_Root(const char *id) {
 }
 
 void destroyPending_Root(iRoot *d) {
+    iRoot *oldRoot = current_Root();
     setCurrent_Root(d);
     iForEach(PtrSet, i, d->pendingDestruction) {
         iWidget *widget = *i.value;
@@ -282,7 +283,7 @@ void destroyPending_Root(iRoot *d) {
         iRelease(widget);
         remove_PtrSetIterator(&i);
     }
-    setCurrent_Root(NULL);
+    setCurrent_Root(oldRoot);
 }
 
 void postArrange_Root(iRoot *d) {
@@ -414,6 +415,7 @@ static iBool handleRootCommands_(iWidget *root, const char *cmd) {
         else {
             addChildPos_Widget(findChild_Widget(root, "stack"), iClob(sidebar), back_WidgetAddPos);
             setWidth_SidebarWidget(sidebar, (float) width_Widget(root) / (float) gap_UI);
+            setWidth_SidebarWidget(sidebar2, (float) width_Widget(root) / (float) gap_UI);
         }
         return iFalse;
     }
@@ -595,7 +597,7 @@ static void updateNavBarSize_(iWidget *navBar) {
     if (isPhone) {
         static const char *buttons[] = { "navbar.back",  "navbar.forward", "navbar.sidebar",
                                          "navbar.ident", "navbar.home",    "navbar.menu" };
-        iWidget *toolBar = findWidget_App("toolbar");
+        iWidget *toolBar = findWidget_Root("toolbar");
         setVisualOffset_Widget(toolBar, 0, 0, 0);
         setFlags_Widget(toolBar, hidden_WidgetFlag, isLandscape_App());
         iForIndices(i, buttons) {
@@ -1216,7 +1218,9 @@ void createUserInterface_Root(iRoot *d) {
         setFlags_Widget(toolBar, moveToParentBottomEdge_WidgetFlag |
                                      parentCannotResizeHeight_WidgetFlag |
                                      resizeWidthOfChildren_WidgetFlag |
-                                     arrangeHeight_WidgetFlag | arrangeHorizontal_WidgetFlag, iTrue);
+                                     arrangeHeight_WidgetFlag | arrangeHorizontal_WidgetFlag |
+                                     commandOnClick_WidgetFlag |
+                                     drawBackgroundToBottom_WidgetFlag, iTrue);
         setBackgroundColor_Widget(toolBar, tmBannerBackground_ColorId);
         setId_Widget(addChildFlags_Widget(toolBar,
                                           iClob(newLargeIcon_LabelWidget("\U0001f870", "navigate.back")),
@@ -1244,17 +1248,17 @@ void createUserInterface_Root(iRoot *d) {
             setFlags_Widget(i.object, noBackground_WidgetFlag, iTrue);
             setTextColor_LabelWidget(i.object, tmBannerIcon_ColorId);
             //            setBackgroundColor_Widget(i.object, tmBannerSideTitle_ColorId);
-            }
+        }
         const iMenuItem items[] = {
             { pin_Icon " ${sidebar.bookmarks}", 0, 0, "toolbar.showview arg:0" },
             { star_Icon " ${sidebar.feeds}", 0, 0, "toolbar.showview arg:1" },
             { clock_Icon " ${sidebar.history}", 0, 0, "toolbar.showview arg:2" },
             { page_Icon " ${toolbar.outline}", 0, 0, "toolbar.showview arg:4" },
-            };
+        };
         iWidget *menu = makeMenu_Widget(findChild_Widget(toolBar, "toolbar.view"),
                                         items, iElemCount(items));
         setId_Widget(menu, "toolbar.menu"); /* view menu */
-        }
+    }
 #endif
     updatePadding_Root(d);
     /* Global context menus. */ {
@@ -1319,6 +1323,11 @@ void createUserInterface_Root(iRoot *d) {
     }
     updateMetrics_Root(d);
     updateNavBarSize_(navBar);
+    if (deviceType_App() == phone_AppDeviceType) {
+        const float sidebarWidth = width_Widget(root) / (float) gap_UI;
+        setWidth_SidebarWidget(findChild_Widget(root, "sidebar"), sidebarWidth);
+        setWidth_SidebarWidget(findChild_Widget(root, "sidebar2"), sidebarWidth);
+    }
 }
 
 void showToolbars_Root(iRoot *d, iBool show) {
diff --git a/src/ui/scrollwidget.c b/src/ui/scrollwidget.c
index 32b57c69..ff5144b2 100644
--- a/src/ui/scrollwidget.c
+++ b/src/ui/scrollwidget.c
@@ -108,7 +108,7 @@ static void unfade_ScrollWidget_(iScrollWidget *d, float opacity) {
     d->fadeStart = SDL_GetTicks() + 1000;
     if (targetValue_Anim(&d->opacity) < opacity) {
         setValue_Anim(&d->opacity, opacity, 66);
-        addTicker_App(animateOpacity_ScrollWidget_, d);
+        addTickerRoot_App(animateOpacity_ScrollWidget_, as_Widget(d)->root, d);
     }
     if (!d->willCheckFade && d->fadeEnabled) {
         d->willCheckFade = iTrue;
diff --git a/src/ui/sidebarwidget.c b/src/ui/sidebarwidget.c
index 1eddd6b7..2c7ee75f 100644
--- a/src/ui/sidebarwidget.c
+++ b/src/ui/sidebarwidget.c
@@ -555,6 +555,7 @@ static void updateMetrics_SidebarWidget_(iSidebarWidget *d) {
                                        .x);
         }
     }
+    printf("maxButtonLabelWidth: %d\n", d->maxButtonLabelWidth);
     updateItemHeight_SidebarWidget_(d);
 }
 
@@ -578,11 +579,11 @@ void init_SidebarWidget(iSidebarWidget *d, enum iSidebarSide side) {
     d->itemFonts[0] = uiContent_FontId;
     d->itemFonts[1] = uiContentBold_FontId;
 #if defined (iPlatformAppleMobile)
-    d->widthAsGaps = 73;
     if (deviceType_App() == phone_AppDeviceType) {
         d->itemFonts[0] = defaultBig_FontId;
         d->itemFonts[1] = defaultBigBold_FontId;
     }
+    d->widthAsGaps = 73;
 #else
     d->widthAsGaps = 60;
 #endif
@@ -806,7 +807,7 @@ void setWidth_SidebarWidget(iSidebarWidget *d, float widthAsGaps) {
     if (isVisible_Widget(w)) {
         w->rect.size.x = width;
     }
-    arrange_Widget(findWidget_App("stack"));
+    arrange_Widget(findWidget_Root("stack"));
     checkModeButtonLayout_SidebarWidget_(d);
     updateItemHeight_SidebarWidget_(d);
     if (!isFixedWidth && !isRefreshPending_App()) {
@@ -1661,7 +1662,7 @@ static void draw_SidebarItem_(const iSidebarItem *d, iPaint *p, iRect itemRect,
         drawRange_Text(
             font, cPos, d->listItem.isSelected ? iconColor : metaFg, range_String(&icon));
         deinit_String(&icon);
-        drawRange_Text(d->listItem.isSelected ? uiContentBold_FontId : font,
+        drawRange_Text(d->listItem.isSelected ? sidebar->itemFonts[1] : font,
                        add_I2(cPos, init_I2(indent, 0)),
                        fg,
                        range_String(&d->label));
diff --git a/src/ui/touch.c b/src/ui/touch.c
index c5634788..f1aa8f06 100644
--- a/src/ui/touch.c
+++ b/src/ui/touch.c
@@ -227,7 +227,7 @@ static void dispatchButtonUp_Touch_(iFloat3 pos) {
 
 static void dispatchNotification_Touch_(const iTouch *d, int code) {
     if (d->affinity) {
-        iRoot *oldRoot = get_Root();
+        iRoot *oldRoot = current_Root();
         setCurrent_Root(d->affinity->root);
         dispatchEvent_Widget(d->affinity, (SDL_Event *) &(SDL_UserEvent){
             .type = SDL_USEREVENT,
@@ -334,7 +334,7 @@ static void update_TouchState_(void *ptr) {
     }
     /* Keep updating if interaction is still ongoing. */
     if (!isEmpty_Array(d->touches) || !isEmpty_Array(d->moms)) {
-        addTicker_App(update_TouchState_, ptr);
+        addTickerRoot_App(update_TouchState_, NULL, ptr);
     }
 }
 
@@ -479,7 +479,7 @@ iBool processEvent_Touch(const SDL_Event *ev) {
         }
         /* This may begin a pinch. */
         checkNewPinch_TouchState_(d, back_Array(d->touches));
-        addTicker_App(update_TouchState_, d);
+        addTickerRoot_App(update_TouchState_, NULL, d);
     }
     else if (ev->type == SDL_FINGERMOTION) {
         iTouch *touch = find_TouchState_(d, fing->fingerId);
diff --git a/src/ui/util.c b/src/ui/util.c
index 2352df7d..fe35031b 100644
--- a/src/ui/util.c
+++ b/src/ui/util.c
@@ -1257,6 +1257,7 @@ static iBool isOmittedPref_(const iString *id) {
     static const char *omittedPrefs[] = {
         "prefs.smoothscroll",
         "prefs.imageloadscroll",
+        "prefs.pinsplit",
         "prefs.retainwindow",
         "prefs.ca.file",
         "prefs.ca.path",
@@ -1597,6 +1598,7 @@ void finalizeSheet_Widget(iWidget *sheet) {
                     if (element == radioButton_PrefsElement) {
                         setBackgroundColor_Widget(value, uiBackgroundSidebar_ColorId);
                         setPadding_Widget(value, 4 * gap_UI, 2 * gap_UI, 4 * gap_UI, 2 * gap_UI);
+                        setFlags_Widget(value, arrangeWidth_WidgetFlag, iFalse);
                         setFlags_Widget(value,
                                         borderBottom_WidgetFlag |
                                         resizeToParentWidth_WidgetFlag |
diff --git a/src/ui/widget.c b/src/ui/widget.c
index 1a0b2ce7..dd0c1b05 100644
--- a/src/ui/widget.c
+++ b/src/ui/widget.c
@@ -151,6 +151,11 @@ void setFlags_Widget(iWidget *d, int64_t flags, iBool set) {
                 removeOne_PtrArray(onTop, d);
             }
         }
+        if (d->flags & arrangeWidth_WidgetFlag &&
+            d->flags & resizeToParentWidth_WidgetFlag) {
+            printf("[Widget] Conflicting flags for ");
+            identify_Widget(d);
+        }
     }
 }
 
@@ -210,7 +215,7 @@ void setVisualOffset_Widget(iWidget *d, int value, uint32_t span, int animFlags)
     else {
         setValue_Anim(&d->visualOffset, value, span);
         d->visualOffset.flags = animFlags;
-        addTicker_App(visualOffsetAnimation_Widget_, d);
+        addTickerRoot_App(visualOffsetAnimation_Widget_, d->root, d);
     }
 }
 
@@ -471,12 +476,19 @@ static void arrange_Widget_(iWidget *d) {
     const int expCount = numExpandingChildren_Widget_(d);
     TRACE(d, "%d expanding children", expCount);
     /* Resize children to fill the parent widget. */
+    iAssert((d->flags & (resizeToParentWidth_WidgetFlag | arrangeWidth_WidgetFlag)) !=
+            (resizeToParentWidth_WidgetFlag | arrangeWidth_WidgetFlag));
     if (d->flags & resizeChildren_WidgetFlag) {
         const iInt2 dirs = init_I2((d->flags & resizeWidthOfChildren_WidgetFlag) != 0,
                                    (d->flags & resizeHeightOfChildren_WidgetFlag) != 0);
 #if !defined (NDEBUG)
         /* Check for conflicting flags. */
-        if (dirs.x) iAssert(~d->flags & arrangeWidth_WidgetFlag);
+        if (dirs.x) {
+            if (d->flags & arrangeWidth_WidgetFlag) {
+                identify_Widget(d);
+            }
+            iAssert(~d->flags & arrangeWidth_WidgetFlag);
+        }
         if (dirs.y) iAssert(~d->flags & arrangeHeight_WidgetFlag);
 #endif
         TRACE(d, "resize children, x:%d y:%d (own size: %dx%d)", dirs.x, dirs.y,
@@ -715,8 +727,10 @@ static void resetArrangement_Widget_(iWidget *d) {
 }
 
 void arrange_Widget(iWidget *d) {
-    resetArrangement_Widget_(d); /* back to initial default sizes */
-    arrange_Widget_(d);
+    if (d) {
+        resetArrangement_Widget_(d); /* back to initial default sizes */
+        arrange_Widget_(d);
+    }
 }
 
 static void applyVisualOffset_Widget_(const iWidget *d, iInt2 *pos) {
@@ -919,9 +933,11 @@ iBool dispatchEvent_Widget(iWidget *d, const SDL_Event *ev) {
             }
         }
         if (class_Widget(d)->processEvent(d, ev)) {
+            iAssert(get_Root() == d->root);
             return iTrue;
         }
     }
+    iAssert(get_Root() == d->root);
     return iFalse;
 }
 
@@ -994,6 +1010,7 @@ iBool processEvent_Widget(iWidget *d, const SDL_Event *ev) {
             }
             if (ev->user.code == command_UserEventCode && d->commandHandler &&
                 d->commandHandler(d, ev->user.data1)) {
+                iAssert(get_Root() == d->root);
                 return iTrue;
             }
             break;
@@ -1586,7 +1603,7 @@ static void printInfo_Widget_(const iWidget *d) {
                cstr_String(text_LabelWidget((const iLabelWidget *) d)),
                cstr_String(command_LabelWidget((const iLabelWidget *) d)));
     }
-    printf("size:%dx%d {min:%dx%d} [%d..%d %d:%d] flags:%08llx%s%s%s%s%s\n",
+    printf("size:%dx%d {min:%dx%d} [%d..%d %d:%d] flags:%08llx%s%s%s%s%s%s%s\n",
            d->rect.size.x, d->rect.size.y,
            d->minSize.x, d->minSize.y,
            d->padding[0], d->padding[2],
@@ -1596,7 +1613,9 @@ static void printInfo_Widget_(const iWidget *d) {
            d->flags & tight_WidgetFlag ? " tight" : "",
            d->flags & fixedWidth_WidgetFlag ? " fixW" : "",
            d->flags & fixedHeight_WidgetFlag ? " fixH" : "",
-           d->flags & resizeToParentWidth_WidgetFlag ? " rsPrnW" : "");
+           d->flags & resizeToParentWidth_WidgetFlag ? " prnW" : "",
+           d->flags & arrangeWidth_WidgetFlag ? " aW" : "",
+           d->flags & resizeWidthOfChildren_WidgetFlag ? " rsWChild" : "");
 }
 
 static void printTree_Widget_(const iWidget *d, int indent) {
diff --git a/src/ui/window.c b/src/ui/window.c
index 232d15e8..5699da4c 100644
--- a/src/ui/window.c
+++ b/src/ui/window.c
@@ -171,19 +171,6 @@ int numRoots_Window(const iWindow *d) {
     return num;
 }
 
-static void setupUserInterface_Window(iWindow *d) {
-#if defined (iPlatformAppleDesktop)
-    insertMacMenus_();
-#endif
-    /* One root is created by default. */
-    d->roots[0] = new_Root();
-    setCurrent_Root(d->roots[0]);
-    createUserInterface_Root(d->roots[0]);
-    setCurrent_Root(NULL);
-    /* One of the roots always has keyboard input focus. */
-    d->keyRoot = d->roots[0];
-}
-
 static void windowSizeChanged_Window_(iWindow *d) {
     const int numRoots = numRoots_Window(d);
     const iInt2 rootSize = d->size;
@@ -214,6 +201,19 @@ static void windowSizeChanged_Window_(iWindow *d) {
     }
 }
 
+static void setupUserInterface_Window(iWindow *d) {
+#if defined (iPlatformAppleDesktop)
+    insertMacMenus_();
+#endif
+    /* One root is created by default. */
+    d->roots[0] = new_Root();
+    setCurrent_Root(d->roots[0]);
+    createUserInterface_Root(d->roots[0]);
+    setCurrent_Root(NULL);
+    /* One of the roots always has keyboard input focus. */
+    d->keyRoot = d->roots[0];
+}
+
 static void updateSize_Window_(iWindow *d, iBool notifyAlways) {
     iInt2 *size = &d->size;
     const iInt2 oldSize = *size;
@@ -761,7 +761,7 @@ static iBool handleWindowEvent_Window_(iWindow *d, const SDL_WindowEvent *ev) {
 #if defined (iPlatformMobile)
         case SDL_WINDOWEVENT_RESIZED:
             /* On mobile, this occurs when the display is rotated. */
-            invalidate_Window_(d);
+            invalidate_Window(d);
             postRefresh_App();
             return iTrue;
 #endif
@@ -772,7 +772,7 @@ static iBool handleWindowEvent_Window_(iWindow *d, const SDL_WindowEvent *ev) {
             d->isExposed = iTrue;
 #if defined (iPlatformMobile)
             /* Returned to foreground, may have lost buffered content. */
-            invalidate_Window_(d);
+            invalidate_Window(d);
             postCommand_App("window.unfreeze");
 #endif
             return iFalse;
@@ -995,7 +995,7 @@ void draw_Window(iWindow *d) {
     /* Check if root needs resizing. */ {
         iInt2 renderSize;
         SDL_GetRendererOutputSize(d->render, &renderSize.x, &renderSize.y);
-        if (!isEqual_I2(renderSize, d->root->rect.size)) {
+        if (!isEqual_I2(renderSize, d->size)) {
             updateSize_Window_(d, iTrue);
             processEvents_App(postedEventsOnly_AppEventMode);
         }
@@ -1008,7 +1008,7 @@ void draw_Window(iWindow *d) {
     /* 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(tmBackground_ColorId);
+        const iColor back = get_Color(uiBackground_ColorId);
 #else
         const iColor back = get_Color(gotFocus && d->place.snap != maximized_WindowSnap &&
                                               ~winFlags & SDL_WINDOW_FULLSCREEN_DESKTOP