4 files changed, 27 insertions, 7 deletions

diff --git a/src/ui/root.c b/src/ui/root.c
index 90c0c6e4..c014ffa8 100644
--- a/src/ui/root.c
+++ b/src/ui/root.c
@@ -244,6 +244,8 @@ void init_Root(iRoot *d) {
 
 void deinit_Root(iRoot *d) {
     iReleasePtr(&d->widget);
+    delete_PtrArray(d->onTop);
+    delete_PtrSet(d->pendingDestruction);
 }
 
 void setCurrent_Root(iRoot *root) {
@@ -284,7 +286,7 @@ void destroyPending_Root(iRoot *d) {
         if (widget->parent) {
             removeChild_Widget(widget->parent, widget);
         }
-        iAssert(widget->parent == NULL);        
+        iAssert(widget->parent == NULL);
         iRelease(widget);
         remove_PtrSetIterator(&i);
     }
diff --git a/src/ui/util.c b/src/ui/util.c
index 53478cba..244eb24d 100644
--- a/src/ui/util.c
+++ b/src/ui/util.c
@@ -1028,6 +1028,7 @@ void openMenuFlags_Widget(iWidget *d, iInt2 windowCoord, iBool postCommands) {
         iRoot *oldRoot = current_Root();
         setFlags_Widget(d, keepOnTop_WidgetFlag, iFalse);
         setUserData_Object(d, parent_Widget(d));
+        iAssert(userData_Object(d));
         removeChild_Widget(parent_Widget(d), d); /* we'll borrow the widget for a while */
         const float pixelRatio = get_Window()->pixelRatio;
         iInt2 menuPos = add_I2(get_MainWindow()->place.normalRect.pos,
@@ -1040,10 +1041,9 @@ void openMenuFlags_Widget(iWidget *d, iInt2 windowCoord, iBool postCommands) {
             menuPos.x = iMin(menuPos.x, displayRect.x + displayRect.w - menuSize.x);
             menuPos.y = iMin(menuPos.y, displayRect.y + displayRect.h - menuSize.y);
         }
-        //        SDL_GetGlobalMouseState(&mousePos.x, &mousePos.y);
-        iWindow *win = newPopup_Window(menuPos, d);
+        iWindow *win = newPopup_Window(menuPos, d); /* window takes the widget */
         SDL_SetWindowTitle(win->win, "Menu");
-        addPopup_App(win); /* window takes the widget */
+        addPopup_App(win);
         SDL_ShowWindow(win->win);
         draw_Window(win);
         setCurrent_Window(mainWindow_App());
diff --git a/src/ui/widget.c b/src/ui/widget.c
index 6b9ee11d..bdc5f090 100644
--- a/src/ui/widget.c
+++ b/src/ui/widget.c
@@ -105,7 +105,12 @@ static void printInfo_Widget_(const iWidget *);
 
 void releaseChildren_Widget(iWidget *d) {
     iForEach(ObjectList, i, d->children) {
-        ((iWidget *) i.object)->parent = NULL; /* the actual reference being held */
+        iWidget *child = i.object;
+        child->parent = NULL; /* the actual reference being held */
+        if (child->flags & keepOnTop_WidgetFlag) {
+            removeOne_PtrArray(onTop_Root(child->root), child);
+            child->flags &= ~keepOnTop_WidgetFlag;
+        }
     }
     iReleasePtr(&d->children);
 }
@@ -318,6 +323,13 @@ void setCommandHandler_Widget(iWidget *d, iBool (*handler)(iWidget *, const char
 }
 
 void setRoot_Widget(iWidget *d, iRoot *root) {
+    if (d->flags & keepOnTop_WidgetFlag) {
+        iAssert(indexOf_PtrArray(onTop_Root(root), d) == iInvalidPos);
+        /* Move it over the new root's onTop list. */
+        removeOne_PtrArray(onTop_Root(d->root), d);
+        iAssert(indexOf_PtrArray(onTop_Root(d->root), d) == iInvalidPos);
+        pushBack_PtrArray(onTop_Root(root), d);
+    }
     d->root = root;
     iForEach(ObjectList, i, d->children) {
         setRoot_Widget(i.object, root);
@@ -1667,7 +1679,13 @@ iAny *removeChild_Widget(iWidget *d, iAnyObject *child) {
         }
     }
     iAssert(found);
-    ((iWidget *) child)->parent = NULL;
+    iWidget *childWidget = child;
+//    if (childWidget->flags & keepOnTop_WidgetFlag) {
+//        removeOne_PtrArray(onTop_Root(childWidget->root), childWidget);
+//        iAssert(indexOf_PtrArray(onTop_Root(childWidget->root), childWidget) == iInvalidPos);
+//    }
+//    printf("%s:%d [%p] parent = NULL\n", __FILE__, __LINE__, d);
+    childWidget->parent = NULL;
     postRefresh_App();
     return child;
 }
diff --git a/src/ui/window.c b/src/ui/window.c
index fb55bb52..77e49dbb 100644
--- a/src/ui/window.c
+++ b/src/ui/window.c
@@ -1597,7 +1597,7 @@ iWindow *newPopup_Window(iInt2 screenPos, iWidget *rootWidget) {
                    SDL_WINDOW_POPUP_MENU |
                    SDL_WINDOW_SKIP_TASKBAR);
 #if defined (iPlatformAppleDesktop)
-    hideTitleBar_MacOS(win); /* make it a borderless window */
+    hideTitleBar_MacOS(win); /* make it a borderless window, but retain shadow */
 #endif
     iRoot *root   = new_Root();
     win->roots[0] = root;