1 files changed, 25 insertions, 0 deletions
diff --git a/dw/widget.cc b/dw/widget.cc
index 68875158..054ad7bf 100644
--- a/dw/widget.cc
+++ b/dw/widget.cc
@@ -91,6 +91,8 @@ Widget::Widget ()
    deleteCallbackFunc = NULL;
 
    widgetImgRenderer = NULL;
+
+   stackingContextMgr = NULL;
 }
 
 Widget::~Widget ()
@@ -104,6 +106,9 @@ Widget::~Widget ()
       delete widgetImgRenderer;
    }
 
+   if (stackingContextMgr)
+      delete stackingContextMgr;
+
    if (style)
       style->unref ();
 
@@ -170,6 +175,17 @@ void Widget::setParent (Widget *parent)
    // Textblock.
    DBG_OBJ_SET_PTR ("container", container);
 
+   // If at all, stackingContextMgr should have set *before*, see also
+   // Widget::setStyle() and Layout::addWidget().
+   if (stackingContextMgr) {
+      Widget *stackingContextWidget = parent;
+      while (stackingContextWidget &&
+             stackingContextWidget->stackingContextMgr == NULL)
+         stackingContextWidget = stackingContextWidget->parent;
+      assert (stackingContextWidget);
+      stackingContextWidget->stackingContextMgr->addChildSCWidget (this);
+   }
+
    notifySetParent();
 }
 
@@ -1078,6 +1094,15 @@ void Widget::setStyle (style::Style *style)
       layout->updateCursor ();
    }
 
+   // After Layout::addWidget() (as toplevel widget) or Widget::setParent()
+   // (which also sets layout), changes of the style cannot be considered
+   // anymore. (Should print a warning?)
+   if (layout == NULL &&
+       StackingContextMgr::isEstablishingStackingContext (this)) {
+      stackingContextMgr = new StackingContextMgr (this);
+      DBG_OBJ_ASSOC_CHILD (stackingContextMgr);
+   }
+
    if (sizeChanged)
       queueResize (0, true);
    else