1 files changed, 25 insertions, 20 deletions

diff --git a/src/ui/window.c b/src/ui/window.c
index 99430a05..abdc363d 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;
@@ -515,15 +515,15 @@ void init_Window(iWindow *d, iRect rect) {
 
 void deinit_Window(iWindow *d) {
     iRecycle();
-    if (theWindow_ == d) {
-        theWindow_ = NULL;
-    }
     iForIndices(i, d->roots) {
         if (d->roots[i]) {
             setCurrent_Root(d->roots[i]);
             deinit_Root(d->roots[i]);
         }
     }
+    if (theWindow_ == d) {
+        theWindow_ = NULL;
+    }
     setCurrent_Root(NULL);
     delete_String(d->pendingSplitUrl);
     deinit_Text();
@@ -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);
         }
@@ -1007,8 +1007,13 @@ void draw_Window(iWindow *d) {
     init_Paint(&p);
     /* Clear the window. The clear color is visible as a border around the window
        when the custom frame is being used. */ {
+        setCurrent_Root(d->roots[0]);
 #if defined (iPlatformAppleMobile)
-        const iColor back = get_Color(tmBackground_ColorId);
+       iColor back = get_Color(uiBackground_ColorId);
+       if (deviceType_App() == phone_AppDeviceType) {
+           /* Page background extends to safe area, so fill it completely. */
+           back = get_Color(tmBackground_ColorId);
+       }
 #else
         const iColor back = get_Color(gotFocus && d->place.snap != maximized_WindowSnap &&
                                               ~winFlags & SDL_WINDOW_FULLSCREEN_DESKTOP