Mobile: Fixing the build post-1.3

3 files changed, 15 insertions, 10 deletions

diff --git a/src/app.c b/src/app.c
index 5cfa8af1..a1475d1c 100644
--- a/src/app.c
+++ b/src/app.c
@@ -639,14 +639,14 @@ static void init_App_(iApp *d, int argc, char **argv) {
 #endif
     init_Prefs(&d->prefs);
     setCStr_String(&d->prefs.downloadDir, downloadDir_App_());
-    d->isRunning         = iFalse;
-    d->window            = NULL;
     set_Atomic(&d->pendingRefresh, iFalse);
-    d->mimehooks         = new_MimeHooks();
-    d->certs             = new_GmCerts(dataDir_App_());
-    d->visited           = new_Visited();
-    d->bookmarks         = new_Bookmarks();
-    d->tabEnum           = 0; /* generates unique IDs for tab pages */
+    d->isRunning = iFalse;
+    d->window    = NULL;
+    d->mimehooks = new_MimeHooks();
+    d->certs     = new_GmCerts(dataDir_App_());
+    d->visited   = new_Visited();
+    d->bookmarks = new_Bookmarks();
+    d->tabEnum   = 0; /* generates unique IDs for tab pages */
     init_Periodic(&d->periodic);
     setThemePalette_Color(d->prefs.theme);
 #if defined (iPlatformAppleDesktop)
diff --git a/src/ui/util.c b/src/ui/util.c
index cdc58154..5656c2c0 100644
--- a/src/ui/util.c
+++ b/src/ui/util.c
@@ -1020,7 +1020,7 @@ static void updateSheetPanelMetrics_(iWidget *sheet) {
     navi->rect.pos = init_I2(left, top);
     iConstForEach(PtrArray, i, findChildren_Widget(sheet, "panel.toppad")) {
         iWidget *pad = *i.value;
-        setSize_Widget(pad, init1_I2(naviHeight));
+        setFixedSize_Widget(pad, init1_I2(naviHeight));
     }
 #endif
     setFixedSize_Widget(navi, init_I2(-1, naviHeight));
@@ -1916,7 +1916,10 @@ void updatePreferencesLayout_Widget(iWidget *prefs) {
             as_Widget(input)->rect.size.x = 0;
         }
     }
-    as_Widget(findChild_Widget(prefs, "bindings"))->rect.size.x = 0;
+    iWidget *bindings = findChild_Widget(prefs, "bindings");
+    if (bindings) {
+        bindings->rect.size.x = 0;
+    }
     resizeToLargestPage_Widget(tabs);
     arrange_Widget(prefs);
     iForIndices(i, inputIds) {
diff --git a/src/ui/window.c b/src/ui/window.c
index 94b84935..21864dce 100644
--- a/src/ui/window.c
+++ b/src/ui/window.c
@@ -1596,6 +1596,7 @@ static void checkPixelRatioChange_Window_(iWindow *d) {
 
 static iBool handleWindowEvent_Window_(iWindow *d, const SDL_WindowEvent *ev) {
     switch (ev->event) {
+#if defined (iPlatformDesktop)
         case SDL_WINDOWEVENT_EXPOSED:
             if (!d->isExposed) {
                 drawBlank_Window_(d); /* avoid showing system-provided contents */
@@ -1615,7 +1616,6 @@ static iBool handleWindowEvent_Window_(iWindow *d, const SDL_WindowEvent *ev) {
             }
 #endif
             return iFalse;
-#if defined (iPlatformDesktop)
         case SDL_WINDOWEVENT_MOVED: {
             if (d->isMinimized) {
                 return iFalse;
@@ -1721,8 +1721,10 @@ static iBool handleWindowEvent_Window_(iWindow *d, const SDL_WindowEvent *ev) {
             setCapsLockDown_Keys(iFalse);
             postCommand_App("window.focus.gained");
 #if defined (iPlatformMobile)
+            d->isExposed = iTrue; /* no expose event is sent, so now we know it's visible */
             /* Returned to foreground, may have lost buffered content. */
             invalidate_Window_(d);
+            postRefresh_App();
 #endif
             return iFalse;
         case SDL_WINDOWEVENT_FOCUS_LOST: