1 files changed, 82 insertions, 1 deletions

diff --git a/dw/oofpositionedmgr.cc b/dw/oofpositionedmgr.cc
index afc2b945..28852258 100644
--- a/dw/oofpositionedmgr.cc
+++ b/dw/oofpositionedmgr.cc
@@ -18,7 +18,6 @@
  */
 
 #include "oofpositionedmgr.hh"
-#include "oofawarewidget.hh"
 #include "../lout/debug.hh"
 
 using namespace lout::object;
@@ -67,6 +66,88 @@ OOFPositionedMgr::~OOFPositionedMgr ()
    DBG_OBJ_DELETE ();
 }
 
+void OOFPositionedMgr::sizeAllocateStart (OOFAwareWidget *caller,
+                                          Allocation *allocation)
+{
+   DBG_OBJ_ENTER ("resize.oofm", 0, "sizeAllocateStart",
+                  "%p, (%d, %d, %d * (%d + %d))",
+                  caller, allocation->x, allocation->y, allocation->width,
+                  allocation->ascent, allocation->descent);
+
+   if (caller == container) {
+      if (containerAllocationState == NOT_ALLOCATED)
+         containerAllocationState = IN_ALLOCATION;
+      containerAllocation = *allocation;
+   }
+
+   DBG_OBJ_LEAVE ();
+}
+
+
+void OOFPositionedMgr::sizeAllocateEnd (OOFAwareWidget *caller)
+{
+   DBG_OBJ_ENTER ("resize.oofm", 0, "sizeAllocateEnd", "%p", caller);
+
+   if (caller == container) {
+      sizeAllocateChildren ();
+
+      bool extremesChanged = !allChildrenConsideredForExtremes ();
+      if (extremesChanged || doChildrenExceedContainer () ||
+          !allChildrenConsideredForSize ())
+         container->oofSizeChanged (extremesChanged);
+      
+      containerAllocationState = WAS_ALLOCATED;
+   }
+
+   DBG_OBJ_LEAVE ();
+}
+
+bool OOFPositionedMgr::doChildrenExceedContainer ()
+{
+   DBG_OBJ_ENTER0 ("resize.oofm", 0, "doChildrenExceedContainer");
+
+   // This method is called to determine whether the *requisition* of
+   // the container must be recalculated. So, we check the allocations
+   // of the children against the *requisition* of the container,
+   // which may (e. g. within tables) differ from the new allocation.
+   // (Generally, a widget may allocated at a different size.)
+
+   Requisition containerReq;
+   container->sizeRequest (&containerReq);
+   bool exceeds = false;
+
+   DBG_OBJ_MSG_START ();
+
+   for (int i = 0; i < children->size () && !exceeds; i++) {
+      Child *child = children->get (i);
+      Allocation *childAlloc = child->widget->getAllocation ();
+      DBG_OBJ_MSGF ("resize.oofm", 2,
+                    "Does childAlloc = (%d, %d, %d * %d) exceed container "
+                    "alloc+req = (%d, %d, %d * %d)?",
+                    childAlloc->x, childAlloc->y, childAlloc->width,
+                    childAlloc->ascent + childAlloc->descent,
+                    containerAllocation.x, containerAllocation.y,
+                    containerReq.width,
+                    containerReq.ascent + containerReq.descent);
+      if (childAlloc->x + childAlloc->width
+          > containerAllocation.x + containerReq.width ||
+          childAlloc->y + childAlloc->ascent + childAlloc->descent
+          > containerAllocation.y +
+            containerReq.ascent + containerReq.descent) {
+         exceeds = true;
+         DBG_OBJ_MSG ("resize.oofm", 2, "Yes.");
+      } else
+         DBG_OBJ_MSG ("resize.oofm", 2, "No.");
+   }
+
+   DBG_OBJ_MSG_END ();
+
+   DBG_OBJ_MSGF ("resize.oofm", 1, "=> %s", exceeds ? "true" : "false");
+   DBG_OBJ_LEAVE ();
+
+   return exceeds;
+}
+
 void OOFPositionedMgr::containerSizeChangedForChildren ()
 {
    DBG_OBJ_ENTER0 ("resize", 0, "containerSizeChangedForChildren");