5 files changed, 39 insertions, 1 deletions

diff --git a/src/app.c b/src/app.c
index 587efd00..52072d39 100644
--- a/src/app.c
+++ b/src/app.c
@@ -1455,11 +1455,17 @@ backToMainLoop:;
 static void runTickers_App_(iApp *d) {
     const uint32_t now = SDL_GetTicks();
     d->elapsedSinceLastTicker = (d->lastTickerTime ? now - d->lastTickerTime : 0);
-    d->lastTickerTime = now;
+    d->lastTickerTime = now;    
     if (isEmpty_SortedArray(&d->tickers)) {
         d->lastTickerTime = 0;
         return;
     }
+    iForIndices(i, d->window->base.roots) {
+        iRoot *root = d->window->base.roots[i];
+        if (root) {
+            root->didAnimateVisualOffsets = iFalse;
+        }
+    }
     /* Tickers may add themselves again, so we'll run off a copy. */
     iSortedArray *pending = copy_SortedArray(&d->tickers);
     clear_SortedArray(&d->tickers);
@@ -1476,6 +1482,10 @@ static void runTickers_App_(iApp *d) {
     if (isEmpty_SortedArray(&d->tickers)) {
         d->lastTickerTime = 0;
     }
+    iForIndices(i, d->window->base.roots) {
+        iRoot *root = d->window->base.roots[i];
+        notifyVisualOffsetChange_Root(root);
+    }
 }
 
 static int resizeWatcher_(void *user, SDL_Event *event) {
diff --git a/src/ui/inputwidget.c b/src/ui/inputwidget.c
index bb3851df..e72ed361 100644
--- a/src/ui/inputwidget.c
+++ b/src/ui/inputwidget.c
@@ -756,6 +756,16 @@ void deinit_InputWidget(iInputWidget *d) {
     deinit_Array(&d->lines);
 }
 
+#if defined (LAGRANGE_ENABLE_SYSTEM_INPUT)
+static void updateAfterVisualOffsetChange_InputWidget_(iInputWidget *d, iRoot *root) {
+    iAssert(as_Widget(d)->root == root);
+    iUnused(root);
+    if (d->sysCtrl) {
+        setRect_SystemTextInput(d->sysCtrl, contentBounds_InputWidget_(d));
+    }
+}
+#endif
+
 void setFont_InputWidget(iInputWidget *d, int fontId) {
     d->font = fontId;
     updateMetrics_InputWidget_(d);
@@ -1047,6 +1057,7 @@ void begin_InputWidget(iInputWidget *d) {
     setRect_SystemTextInput(d->sysCtrl, contentBounds_InputWidget_(d));
     setText_SystemTextInput(d->sysCtrl, &d->oldText);
     setTextChangedFunc_SystemTextInput(d->sysCtrl, systemInputChanged_InputWidget_, d);
+    iConnect(Root, w->root, visualOffsetsChanged, d, updateAfterVisualOffsetChange_InputWidget_);
     return;
 #endif
     if (d->mode == overwrite_InputMode) {
@@ -1080,6 +1091,7 @@ void end_InputWidget(iInputWidget *d, iBool accept) {
         return;
     }
     if (d->sysCtrl) {
+        iDisconnect(Root, w->root, visualOffsetsChanged, d, updateAfterVisualOffsetChange_InputWidget_);
         if (accept) {
             splitToLines_(text_SystemTextInput(d->sysCtrl), &d->lines);
         }
diff --git a/src/ui/root.c b/src/ui/root.c
index 0e949246..5a579eb4 100644
--- a/src/ui/root.c
+++ b/src/ui/root.c
@@ -241,6 +241,7 @@ static int       loadAnimIndex_      = 0;
 static iRoot *   activeRoot_     = NULL;
 
 iDefineTypeConstruction(Root)
+iDefineAudienceGetter(Root, visualOffsetsChanged)
 
 void init_Root(iRoot *d) {
     iZap(*d);
@@ -250,6 +251,7 @@ void deinit_Root(iRoot *d) {
     iReleasePtr(&d->widget);
     delete_PtrArray(d->onTop);
     delete_PtrSet(d->pendingDestruction);
+    delete_Audience(d->visualOffsetsChanged);
 }
 
 void setCurrent_Root(iRoot *root) {
@@ -658,6 +660,12 @@ void updateToolbarColors_Root(iRoot *d) {
 #endif
 }
 
+void notifyVisualOffsetChange_Root(iRoot *d) {
+    if (d && d->didAnimateVisualOffsets) {
+        iNotifyAudience(d, visualOffsetsChanged, RootVisualOffsetsChanged);
+    }
+}
+
 void dismissPortraitPhoneSidebars_Root(iRoot *d) {
     if (deviceType_App() == phone_AppDeviceType && isPortrait_App()) {
         iWidget *sidebar = findChild_Widget(d->widget, "sidebar");
diff --git a/src/ui/root.h b/src/ui/root.h
index 851d927d..2419b599 100644
--- a/src/ui/root.h
+++ b/src/ui/root.h
@@ -2,11 +2,15 @@
 
 #include "widget.h"
 #include "color.h"
+#include <the_Foundation/audience.h>
 #include <the_Foundation/ptrset.h>
 #include <the_Foundation/vec2.h>
 
 iDeclareType(Root)
 
+iDeclareNotifyFunc(Root, VisualOffsetsChanged)
+iDeclareAudienceGetter(Root, visualOffsetsChanged)
+
 struct Impl_Root {
     iWidget *  widget;
     iWindow *  window;
@@ -14,6 +18,8 @@ struct Impl_Root {
     iPtrSet *  pendingDestruction;
     iBool      pendingArrange;
     int        loadAnimTimer;
+    iBool      didAnimateVisualOffsets;
+    iAudience *visualOffsetsChanged; /* called after running tickers */
     iColor     tmPalette[tmMax_ColorId]; /* theme-specific palette */
 };
 
@@ -36,6 +42,7 @@ void        updatePadding_Root                  (iRoot *); /* TODO: is part of m
 void        dismissPortraitPhoneSidebars_Root   (iRoot *);
 void        showToolbar_Root                    (iRoot *, iBool show);
 void        updateToolbarColors_Root            (iRoot *);
+void        notifyVisualOffsetChange_Root       (iRoot *);
 
 iInt2       size_Root                           (const iRoot *);
 iRect       rect_Root                           (const iRoot *);
diff --git a/src/ui/widget.c b/src/ui/widget.c
index 0d20cca9..225c0480 100644
--- a/src/ui/widget.c
+++ b/src/ui/widget.c
@@ -142,6 +142,7 @@ void init_Widget(iWidget *d) {
 static void visualOffsetAnimation_Widget_(void *ptr) {
     iWidget *d = ptr;
     postRefresh_App();
+    d->root->didAnimateVisualOffsets = iTrue;
     if (!isFinished_Anim(&d->visualOffset)) {
         addTicker_App(visualOffsetAnimation_Widget_, ptr);
     }