Merge branch 'dev' into work/typesetter

# Conflicts:
#	src/ui/documentwidget.c
#	src/ui/inputwidget.c

1 files changed, 31 insertions, 17 deletions

diff --git a/src/app.c b/src/app.c
index a50a4553..cc172139 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 noanim:1");
+                        if (flags & 2) postCommand_Root(root, "sidebar2.toggle noanim:1");
+                    }
                 }
             }
             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) {
@@ -1061,7 +1068,14 @@ void processEvents_App(enum iAppEventMode eventMode) {
                     }
                     continue;
                 }
-                else if (ev.type == SDL_USEREVENT && ev.user.code == arrange_UserEventCode) {
+                d->lastEventTime = SDL_GetTicks();
+                if (d->isIdling) {
+//                    printf("[App] ...woke up\n");
+//                    fflush(stdout);
+                }
+                d->isIdling = iFalse;
+#endif
+                if (ev.type == SDL_USEREVENT && ev.user.code == arrange_UserEventCode) {
                     printf("[App] rearrange\n");
                     resize_Window(d->window, -1, -1);
                     iForIndices(i, d->window->roots) {
@@ -1078,13 +1092,6 @@ void processEvents_App(enum iAppEventMode eventMode) {
 //                    postRefresh_App();
                     continue;
                 }
-                d->lastEventTime = SDL_GetTicks();
-                if (d->isIdling) {
-//                    printf("[App] ...woke up\n");
-//                    fflush(stdout);
-                }
-                d->isIdling = iFalse;
-#endif
                 gotEvents = iTrue;
                 /* Keyboard modifier mapping. */
                 if (ev.type == SDL_KEYDOWN || ev.type == SDL_KEYUP) {
@@ -1187,7 +1194,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);
         }
     }
@@ -1418,13 +1425,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) {
@@ -1507,6 +1520,7 @@ static void updateFontButton_(iLabelWidget *button, int font) {
 
 static iBool handlePrefsCommands_(iWidget *d, const char *cmd) {
     if (equal_Command(cmd, "prefs.dismiss") || equal_Command(cmd, "preferences")) {
+        setupSheetTransition_Mobile(d, iFalse);
         setUiScale_Window(get_Window(),
                           toFloat_String(text_InputWidget(findChild_Widget(d, "prefs.uiscale"))));
 #if defined (LAGRANGE_ENABLE_DOWNLOAD_EDIT)
@@ -2381,7 +2395,7 @@ iBool handleCommand_App(const char *cmd) {
         iCertImportWidget *imp = new_CertImportWidget();
         setPageContent_CertImportWidget(imp, sourceContent_DocumentWidget(document_App()));
         addChild_Widget(get_Root()->widget, iClob(imp));
-        finalizeSheet_Widget(as_Widget(imp));
+        finalizeSheet_Mobile(as_Widget(imp));
         postRefresh_App();
         return iTrue;
     }