Moved handling of float size changes to OOFM::sizeAllocateEnd(). (Still buggy, though.)

2 files changed, 59 insertions, 33 deletions

diff --git a/dw/outofflowmgr.cc b/dw/outofflowmgr.cc
index fe1156b8..6264d77a 100644
--- a/dw/outofflowmgr.cc
+++ b/dw/outofflowmgr.cc
@@ -40,7 +40,7 @@ OutOfFlowMgr::Float::Float (OutOfFlowMgr *oofm, Widget *widget,
    this->externalIndex = externalIndex;
 
    yReq = yReal = size.width = size.ascent = size.descent = 0;
-   dirty = true;
+   dirty = sizeChangedSinceLastAllocation = true;
    inCBList = false;
 }
 
@@ -73,7 +73,9 @@ void OutOfFlowMgr::Float::intoStringBuffer(StringBuffer *sb)
    sb->appendInt (size.descent);
    sb->append (" }, dirty = ");
    sb->appendBool (dirty);
-   sb->append (" }, inCBList = ");
+   sb->append (", sizeChangedSinceLastAllocation = ");
+   sb->appendBool (sizeChangedSinceLastAllocation);
+   sb->append (", inCBList = ");
    sb->appendBool (inCBList);
    sb->append (" }");
 }
@@ -424,6 +426,9 @@ void OutOfFlowMgr::sizeAllocateEnd ()
          }
       }
 
+      // TODO Comment and re-number.
+      checkChangedFloatSizes ();
+
       // (ii) store some information for later use.
       tbInfo->wasAllocated = true;
       tbInfo->xCB = xCB;
@@ -514,6 +519,53 @@ bool OutOfFlowMgr::isTextblockCoveredByFloat (Float *vloat, Textblock *tb,
       return false;
 }
 
+void OutOfFlowMgr::checkChangedFloatSizes ()
+{
+   checkChangedFloatSizes (leftFloatsCB);
+   checkChangedFloatSizes (rightFloatsCB);
+}
+
+void OutOfFlowMgr::checkChangedFloatSizes (SortedFloatsVector *list)
+{
+   // TODO (i) Comment (ii) linear search?
+   for (int i = 0; i < list->size(); i++) {
+      // TODO binary search
+      Float *vloat = list->get(i);
+
+      if (vloat->sizeChangedSinceLastAllocation &&
+          wasAllocated (vloat->generatingBlock)) {
+         //printf ("=== start checking textblocks ===\n");
+
+         for (lout::container::typed::Iterator<TypedPointer <Textblock> > it =
+                 tbInfosByTextblock->iterator ();
+              it.hasNext (); ) {
+            Textblock *tb = it.getNext()->getTypedValue();
+            if (wasAllocated (tb)) {
+               Allocation *tba = getAllocation (tb);
+               int floatPos;
+               
+               if (isTextblockCoveredByFloat
+                   (vloat, tb, tba->x - containingBlockAllocation.x,
+                    tba->y - containingBlockAllocation.y,
+                    tba->width, tba->ascent + tba->descent, &floatPos)) {
+                  //printf ("   ---> yes: %p (parent: %p)\n", tb,
+                  //        tb->getParent());
+                  tb->borderChanged (floatPos, vloat->widget);
+               } //else
+                 // printf ("   ---> not covered: %p (parent: %p)\n", tb,
+                 //         tb->getParent());
+            } //else
+              // printf ("   ---> not allocated: %p (parent: %p)\n", tb,
+              //         tb->getParent());
+         }
+         
+         //printf ("=== end checking textblocks ===\n");
+
+         vloat->sizeChangedSinceLastAllocation = false;
+      }
+   }
+}
+
 void OutOfFlowMgr::moveFromGBToCB (Side side)
 {
    SortedFloatsVector *dest = side == LEFT ? leftFloatsCB : rightFloatsCB;
@@ -804,7 +856,7 @@ void OutOfFlowMgr::markSizeChange (int ref)
          vloat = NULL; // compiler happiness
       }
       
-      vloat->dirty = true;
+      vloat->dirty = vloat->sizeChangedSinceLastAllocation = true;
       
       // Effects take place in ensureFloatSize.
    } else if (isRefAbsolutelyPositioned (ref)) {
@@ -1374,35 +1426,7 @@ void OutOfFlowMgr::ensureFloatSize (Float *vloat)
       vloat->cbAvailWidth = containingBlock->getAvailWidth ();
       vloat->dirty = false;
 
-      // TODO (i) Comment (ii) linear search?
-      if (wasAllocated (vloat->generatingBlock)) {
-         //printf ("=== start checking textblocks ===\n");
-
-         for (lout::container::typed::Iterator<TypedPointer <Textblock> > it =
-                 tbInfosByTextblock->iterator ();
-              it.hasNext (); ) {
-            Textblock *tb = it.getNext()->getTypedValue();
-            if (wasAllocated (tb)) {
-               Allocation *tba = getAllocation (tb);
-               int floatPos;
-
-               if (isTextblockCoveredByFloat
-                   (vloat, tb, tba->x - containingBlockAllocation.x,
-                    tba->y - containingBlockAllocation.y,
-                    tba->width, tba->ascent + tba->descent, &floatPos)) {
-                  //printf ("   ---> yes: %p (parent: %p)\n", tb,
-                  //        tb->getParent());
-                  tb->borderChanged (floatPos, vloat->widget);
-               } //else
-                 // printf ("   ---> not covered: %p (parent: %p)\n", tb,
-                 //         tb->getParent());
-            } //else
-              // printf ("   ---> not allocated: %p (parent: %p)\n", tb,
-              //         tb->getParent());
-         }
-
-         //printf ("=== end checking textblocks ===\n");
-      }
+      // "sizeChangedSinceLastAllocation" is reset in sizeAllocateEnd()
    }
 }
 
diff --git a/dw/outofflowmgr.hh b/dw/outofflowmgr.hh
index 23b8134c..6cae9c37 100644
--- a/dw/outofflowmgr.hh
+++ b/dw/outofflowmgr.hh
@@ -62,7 +62,7 @@ private:
       int cbAvailWidth; /* On which the calculation of relative sizes
                            is based. Height not yet used, and probably
                            not added before size redesign. */
-      bool dirty;
+      bool dirty, sizeChangedSinceLastAllocation;
       bool inCBList; /* Neccessary to prevent floats from being moved
                         twice from GB to CB list.  */
 
@@ -208,6 +208,8 @@ private:
    bool isTextblockCoveredByFloat (Float *vloat, Textblock *tb,
                                    int tbx, int tby, int tbWidth, int tbHeight,
                                    int *floatPos);
+   void checkChangedFloatSizes ();
+   void checkChangedFloatSizes (SortedFloatsVector *list);
    
    void drawFloats (SortedFloatsVector *list, core::View *view,
                     core::Rectangle *area);