diff options
| author | Sebastian Geerken <devnull@localhost> | 2014-03-10 13:27:05 +0100 |
|---|---|---|
| committer | Sebastian Geerken <devnull@localhost> | 2014-03-10 13:27:05 +0100 |
| commit | f4c3afa94c68f889b63d8ee24927c6a675915a28 (patch) | |
| tree | ef1a663f175d572ea334e220ffae6a1a5021daf2 /dw/outofflowmgr.cc | |
| parent | 20ea7997b6134073fcd3494c07d21e5c967549b5 (diff) | |
RTFL.
Diffstat (limited to 'dw/outofflowmgr.cc')
| -rw-r--r-- | dw/outofflowmgr.cc | 24 |
1 files changed, 18 insertions, 6 deletions
diff --git a/dw/outofflowmgr.cc b/dw/outofflowmgr.cc index 6ed2349a..fb7a508d 100644 --- a/dw/outofflowmgr.cc +++ b/dw/outofflowmgr.cc @@ -1512,9 +1512,17 @@ void OutOfFlowMgr::getFloatsExtremes (Extremes *cbExtr, Side side, vloat->getWidget()->getExtremes (&extr); int leftDiff, rightDiff; + DBG_OBJ_MSGF ("resize.oofm", 1, + "considering float %p generated by %p: %d / %d", + vloat->getWidget (), vloat->generatingBlock, + extr.minWidth, extr.maxWidth); + if (vloat->generatingBlock == containingBlock) { leftDiff = vloat->generatingBlock->getStyle()->boxOffsetX(); rightDiff = vloat->generatingBlock->getStyle()->boxRestWidth(); + DBG_OBJ_MSGF ("resize.oofm", 1, + "GB == CB => leftDiff = %d, rightDiff = %d", + leftDiff, rightDiff); } else { Allocation *gba = getAllocation(vloat->generatingBlock); leftDiff = gba->x - containingBlockAllocation.x @@ -1523,6 +1531,15 @@ void OutOfFlowMgr::getFloatsExtremes (Extremes *cbExtr, Side side, (containingBlockAllocation.x + containingBlockAllocation.width) - (gba->x - gba->width) + vloat->generatingBlock->getStyle()->boxRestWidth(); + DBG_OBJ_MSGF ("resize.oofm", 1, + "GB != CB => leftDiff = %d - %d + %d = %d, " + "rightDiff = (%d + %d) - (%d + %d) + %d = %d", + gba->x, containingBlockAllocation.x, + vloat->generatingBlock->getStyle()->boxOffsetX(), + leftDiff, containingBlockAllocation.x, + containingBlockAllocation.width, gba->x, gba->width, + vloat->generatingBlock->getStyle()->boxRestWidth(), + rightDiff); } // TODO: Or zero (instead of rightDiff) for right floats? @@ -1530,12 +1547,7 @@ void OutOfFlowMgr::getFloatsExtremes (Extremes *cbExtr, Side side, extr.minWidth + side == LEFT ? leftDiff : rightDiff); *maxWidth = max (*maxWidth, extr.maxWidth + leftDiff + rightDiff); - DBG_OBJ_MSGF ("resize.oofm", 1, - "considering float %p generated by %p: (%d, %d / %d, %d)" - " => %d / %d", - vloat->getWidget (), vloat->generatingBlock, - leftDiff, extr.minWidth, extr.maxWidth, rightDiff, - *minWidth, *maxWidth); + DBG_OBJ_MSGF ("resize.oofm", 1, " => %d / %d", *minWidth, *maxWidth); } else DBG_OBJ_MSGF ("resize.oofm", 1, "considering float %p generated by %p: not allocated", |