diff options
| -rw-r--r-- | dw/outofflowmgr.cc | 10 | ||||
| -rw-r--r-- | dw/outofflowmgr.hh | 7 |
2 files changed, 9 insertions, 8 deletions
diff --git a/dw/outofflowmgr.cc b/dw/outofflowmgr.cc index 95898f0a..9e833a8a 100644 --- a/dw/outofflowmgr.cc +++ b/dw/outofflowmgr.cc @@ -251,6 +251,13 @@ int OutOfFlowMgr::SortedFloatsVector::findLastBeforeSideSpanningIndex return bsearch (&key, false, &comparator) - 1; } +void OutOfFlowMgr::SortedFloatsVector::put (Float *vloat) +{ + lout::container::typed::Vector<Float>::put (vloat); + vloat->index = size() - 1; + vloat->inCBList = type == CB; +} + OutOfFlowMgr::TBInfo::TBInfo (OutOfFlowMgr *oofm, Textblock *textblock) { this->textblock = textblock; @@ -472,7 +479,6 @@ void OutOfFlowMgr::moveFromGBToCB (Side side) Float *vloat = src->get(i); if (!vloat->inCBList && vloat->mark == mark) { dest->put (vloat); - vloat->inCBList = true; //printf("[%p] moving %s float %p (%s %p, mark %d) to CB list\n", // containingBlock, side == LEFT ? "left" : "right", // vloat, vloat->widget->getClassName(), vloat->widget, @@ -586,7 +592,6 @@ void OutOfFlowMgr::addWidget (Widget *widget, Textblock *generatingBlock, if (wasAllocated (generatingBlock)) { leftFloatsCB->put (vloat); - vloat->inCBList = true; //printf ("[%p] adding left float %p (%s %p) to CB list\n", // containingBlock, vloat, widget->getClassName(), widget); } else { @@ -610,7 +615,6 @@ void OutOfFlowMgr::addWidget (Widget *widget, Textblock *generatingBlock, if (wasAllocated (generatingBlock)) { rightFloatsCB->put (vloat); - vloat->inCBList = true; //printf ("[%p] adding right float %p (%s %p) to CB list\n", // containingBlock, vloat, widget->getClassName(), widget); } else { diff --git a/dw/outofflowmgr.hh b/dw/outofflowmgr.hh index 8811b021..d48dc468 100644 --- a/dw/outofflowmgr.hh +++ b/dw/outofflowmgr.hh @@ -82,8 +82,7 @@ private: class SortedFloatsVector: private lout::container::typed::Vector<Float> { public: - enum Type { GB, CB } type; /* Only used for debugging; may be removed - later. */ + enum Type { GB, CB } type; private: OutOfFlowMgr *oofm; @@ -99,9 +98,7 @@ private: int findFirst (Textblock *textblock, int y, int h, Textblock *lastGB, int lastExtIndex); int findLastBeforeSideSpanningIndex (int sideSpanningIndex); - inline void put (Float *vloat) - { lout::container::typed::Vector<Float>::put (vloat); - vloat->index = size() - 1; } + void put (Float *vloat); inline void change (Float *vloat) { } inline lout::container::typed::Iterator<Float> iterator() |