8 files changed, 25 insertions, 24 deletions

diff --git a/src/ui/inputwidget.c b/src/ui/inputwidget.c
index d078593a..a561d5bd 100644
--- a/src/ui/inputwidget.c
+++ b/src/ui/inputwidget.c
@@ -1916,6 +1916,7 @@ static iBool processEvent_InputWidget_(iInputWidget *d, const SDL_Event *ev) {
         }
         return iFalse;
     }
+    /* TODO: Scroll to keep widget visible when keyboard appears. */
 //    else if (isCommand_UserEvent(ev, "keyboard.changed")) {
 //        if (isFocused_Widget(d) && arg_Command(command_UserEvent(ev))) {
 //            iRect rect = bounds_Widget(w);
diff --git a/src/ui/mobile.c b/src/ui/mobile.c
index e04e8d20..3cb6e631 100644
--- a/src/ui/mobile.c
+++ b/src/ui/mobile.c
@@ -425,10 +425,10 @@ static iWidget *addChildPanel_(iWidget *parent, iLabelWidget *panelButton,
     return panel;
 }
 
-void finalizeSheet_Mobile(iWidget *sheet) {
-    arrange_Widget(sheet);
+//void finalizeSheet_Mobile(iWidget *sheet) {
+//    arrange_Widget(sheet);
 //    postRefresh_App();
-}
+//}
 
 static size_t countItems_(const iMenuItem *itemsNullTerminated) {
     size_t num = 0;
diff --git a/src/ui/mobile.h b/src/ui/mobile.h
index 957c0e42..9d7ac8e4 100644
--- a/src/ui/mobile.h
+++ b/src/ui/mobile.h
@@ -55,5 +55,3 @@ enum iTransitionDir {
 
 void        setupMenuTransition_Mobile  (iWidget *menu,  iBool isIncoming);
 void        setupSheetTransition_Mobile (iWidget *sheet, int flags);
-
-void        finalizeSheet_Mobile        (iWidget *sheet);
diff --git a/src/ui/root.c b/src/ui/root.c
index 71f53af4..21bed366 100644
--- a/src/ui/root.c
+++ b/src/ui/root.c
@@ -271,13 +271,15 @@ void destroyPending_Root(iRoot *d) {
     setCurrent_Root(d);
     iForEach(PtrSet, i, d->pendingDestruction) {
         iWidget *widget = *i.value;
+        iAssert(widget->root == d);
         if (!isFinished_Anim(&widget->visualOffset) ||
             isBeingVisuallyOffsetByReference_Widget(widget)) {
             continue;
         }
         if (widget->flags & keepOnTop_WidgetFlag) {
-            removeOne_PtrArray(onTop_Root(widget->root), widget);
+            removeOne_PtrArray(d->onTop, widget);
         }
+        iAssert(indexOf_PtrArray(d->onTop, widget) == iInvalidPos);
         if (widget->parent) {
             removeChild_Widget(widget->parent, widget);
         }
diff --git a/src/ui/touch.c b/src/ui/touch.c
index 5130149b..613f2c0d 100644
--- a/src/ui/touch.c
+++ b/src/ui/touch.c
@@ -472,13 +472,9 @@ iBool processEvent_Touch(const SDL_Event *ev) {
     }
     iTouchState *d = touchState_();
     iWindow *window = get_Window();    
-//    if (!isFinished_Anim(&window->rootOffset)) {
-//        return iFalse;
-//    }
     const iInt2 rootSize = size_Window(window);
     const SDL_TouchFingerEvent *fing = &ev->tfinger;
-    const iFloat3 pos = add_F3(init_F3(fing->x * rootSize.x, fing->y * rootSize.y, 0), /* pixels */
-                               init_F3(0, 0 /*-value_Anim(&window->rootOffset)*/, 0));
+    const iFloat3 pos = init_F3(fing->x * rootSize.x, fing->y * rootSize.y, 0); /* pixels */
     const uint32_t nowTime = SDL_GetTicks();
     if (ev->type == SDL_FINGERDOWN) {
         /* Register the new touch. */
diff --git a/src/ui/widget.c b/src/ui/widget.c
index 25142691..184ce2a3 100644
--- a/src/ui/widget.c
+++ b/src/ui/widget.c
@@ -163,11 +163,15 @@ static void aboutToBeDestroyed_Widget_(iWidget *d) {
     d->flags |= destroyPending_WidgetFlag;
     if (isFocused_Widget(d)) {
         setFocus_Widget(NULL);
-        return;
+        //return; /* TODO: Why?! */
     }
     remove_Periodic(periodic_App(), d);
+    iWindow *win = get_Window();
     if (isHover_Widget(d)) {
-        get_Window()->hover = NULL;
+        win->hover = NULL;
+    }
+    if (win->lastHover == d) {
+        win->lastHover = NULL;
     }
     iForEach(ObjectList, i, d->children) {
         aboutToBeDestroyed_Widget_(as_Widget(i.object));
@@ -214,6 +218,7 @@ void setFlags_Widget(iWidget *d, int64_t flags, iBool set) {
             }
             else {
                 removeOne_PtrArray(onTop, d);
+                iAssert(indexOf_PtrArray(onTop, d) == iInvalidPos);
             }
         }
         if (d->flags & arrangeWidth_WidgetFlag &&
@@ -880,9 +885,6 @@ iInt2 localToWindow_Widget(const iWidget *d, iInt2 localCoord) {
         applyVisualOffset_Widget_(w, &pos);
         addv_I2(&window, pos);
     }
-//#if defined (iPlatformMobile)
-//    window.y += value_Anim(&get_Window()->rootOffset);
-//#endif
     return window;
 }
 
@@ -962,7 +964,11 @@ static iBool filterEvent_Widget_(const iWidget *d, const SDL_Event *ev) {
 }
 
 void unhover_Widget(void) {
-    get_Window()->hover = NULL;
+    iWidget **hover = &get_Window()->hover;
+    if (*hover) {
+        refresh_Widget(*hover);
+    }
+    *hover = NULL;
 }
 
 iBool dispatchEvent_Widget(iWidget *d, const SDL_Event *ev) {
@@ -1415,7 +1421,9 @@ static void findPotentiallyVisible_Widget_(const iWidget *d, iPtrArray *pvs) {
     iRect fullyMasked = zero_Rect();
     if (isRoot_Widget_(d)) {
         iReverseConstForEach(PtrArray, i, onTop_Root(d->root)) {
-            addToPotentiallyVisible_Widget_(i.ptr, pvs, &fullyMasked);
+            const iWidget *top = i.ptr;
+            iAssert(top->parent);
+            addToPotentiallyVisible_Widget_(top, pvs, &fullyMasked);
         }
     }
     iReverseConstForEach(ObjectList, i, d->children) {
diff --git a/src/ui/window.c b/src/ui/window.c
index ed2ec024..0dd248e6 100644
--- a/src/ui/window.c
+++ b/src/ui/window.c
@@ -405,6 +405,7 @@ void init_Window(iWindow *d, iRect rect) {
     d->splitMode = d->pendingSplitMode = 0;
     d->pendingSplitUrl = new_String();
     d->hover = NULL;
+    d->lastHover = NULL;
     d->mouseGrab = NULL;
     d->focus = NULL;
     iZap(d->cursors);
@@ -421,7 +422,6 @@ void init_Window(iWindow *d, iRect rect) {
     d->ignoreClick = iFalse;
     d->focusGainedAt = 0;
     d->keyboardHeight = 0;
-//    init_Anim(&d->rootOffset, 0.0f);
     uint32_t flags = 0;
 #if defined (iPlatformAppleDesktop)
     SDL_SetHint(SDL_HINT_RENDER_DRIVER, shouldDefaultToMetalRenderer_MacOS() ? "metal" : "opengl");
@@ -1215,10 +1215,6 @@ iBool isOpenGLRenderer_Window(void) {
 void setKeyboardHeight_Window(iWindow *d, int height) {
     if (d->keyboardHeight != height) {
         d->keyboardHeight = height;
-//        if (height == 0) {
-//            setFlags_Anim(&d->rootOffset, easeBoth_AnimFlag, iTrue);
-//            setValue_Anim(&d->rootOffset, 0, 250);
-//        }
         postCommandf_App("keyboard.changed arg:%d", height);
         postRefresh_App();
     }
diff --git a/src/ui/window.h b/src/ui/window.h
index a5b8f137..282e1682 100644
--- a/src/ui/window.h
+++ b/src/ui/window.h
@@ -86,6 +86,7 @@ struct Impl_Window {
     iRoot *       roots[2];     /* root widget and UI state; second one is for split mode */
     iRoot *       keyRoot;      /* root that has the current keyboard input focus */
     iWidget *     hover;
+    iWidget *     lastHover;    /* cleared if deleted */
     iWidget *     mouseGrab;
     iWidget *     focus;
     float         pixelRatio;   /* conversion between points and pixels, e.g., coords, window size */
@@ -98,7 +99,6 @@ struct Impl_Window {
     SDL_Cursor *  cursors[SDL_NUM_SYSTEM_CURSORS];
     SDL_Cursor *  pendingCursor;
     int           loadAnimTimer;
-//    iAnim         rootOffset;
     int           keyboardHeight; /* mobile software keyboards */
 };