diff options
Diffstat (limited to 'test/dw_simple_container.cc')
| -rw-r--r-- | test/dw_simple_container.cc | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/test/dw_simple_container.cc b/test/dw_simple_container.cc index 7fa9bf75..c1f22458 100644 --- a/test/dw_simple_container.cc +++ b/test/dw_simple_container.cc @@ -32,7 +32,7 @@ int SimpleContainer::CLASS_ID = -1; // ---------------------------------------------------------------------- SimpleContainer::SimpleContainerIterator::SimpleContainerIterator - (SimpleContainer *simpleContainer, Content::Type mask, bool atEnd) : +(SimpleContainer *simpleContainer, Content::Type mask, bool atEnd) : Iterator (simpleContainer, mask, atEnd) { content.type = atEnd ? Content::END : Content::START; @@ -63,7 +63,7 @@ int SimpleContainer::SimpleContainerIterator::index () } int SimpleContainer::SimpleContainerIterator::compareTo - (lout::object::Comparable *other) +(lout::object::Comparable *other) { return index () - ((SimpleContainerIterator*)other)->index (); } @@ -182,8 +182,9 @@ void SimpleContainer::getExtremesImpl (Extremes *extremes) if (child) child->getExtremes (&childExtr); else - childExtr.minWidth = childExtr.maxWidth = 0; - + childExtr.minWidth = childExtr.minWidthIntrinsic = childExtr.maxWidth = + childExtr.maxWidthIntrinsic = extremes->adjustmentWidth = 0; + extremes->minWidth = childExtr.minWidth + boxDiffWidth (); extremes->minWidthIntrinsic = childExtr.minWidthIntrinsic + boxDiffWidth (); extremes->maxWidth = childExtr.maxWidth + boxDiffWidth (); @@ -193,7 +194,6 @@ void SimpleContainer::getExtremesImpl (Extremes *extremes) correctExtremes (extremes, true); } - void SimpleContainer::sizeAllocateImpl (Allocation *allocation) { Allocation childAlloc; @@ -208,12 +208,14 @@ void SimpleContainer::sizeAllocateImpl (Allocation *allocation) } } -void SimpleContainer::draw (View *view, Rectangle *area) +void SimpleContainer::draw (View *view, Rectangle *area, + StackingIteratorStack *iteratorStack, + Widget **interruptedWidget) { drawWidgetBox (view, area, false); Rectangle childArea; if (child && child->intersects (area, &childArea)) - child->draw (view, &childArea); + child->drawTotal (view, &childArea, iteratorStack, interruptedWidget); } Iterator *SimpleContainer::iterator (Content::Type mask, bool atEnd) |