diff options
| author | Sebastian Geerken <devnull@localhost> | 2015-09-22 20:23:27 +0200 |
|---|---|---|
| committer | Sebastian Geerken <devnull@localhost> | 2015-09-22 20:23:27 +0200 |
| commit | d11f25560a31a68d56a72abc6d888bc8cf2634b7 (patch) | |
| tree | 84a1fed01439eecf6551fba096edf6d91d5312f9 /dw/textblock_linebreaking.cc | |
| parent | af3aa61519ae6c37dd4984100697f7aa032403de (diff) | |
SRDOP: OOFFloatsMgr now regards positions relative to container. (Code compiles, not more!)
Diffstat (limited to 'dw/textblock_linebreaking.cc')
| -rw-r--r-- | dw/textblock_linebreaking.cc | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/dw/textblock_linebreaking.cc b/dw/textblock_linebreaking.cc index 03933830..81e60a71 100644 --- a/dw/textblock_linebreaking.cc +++ b/dw/textblock_linebreaking.cc @@ -2070,20 +2070,17 @@ void Textblock::calcBorders (int lastOofRef, int height) int y = yRef + yRel; bool thisHasLeft, thisHasRight; - thisHasLeft = oofm->hasFloatLeft (this, y, height, this, effOofRef); + thisHasLeft = oofm->hasFloatLeft (y, height, this, effOofRef); newLineHasFloatLeft = newLineHasFloatLeft || thisHasLeft; - thisHasRight = oofm->hasFloatRight (this, y, height, this, - effOofRef); + thisHasRight = oofm->hasFloatRight (y, height, this, effOofRef); newLineHasFloatRight = newLineHasFloatRight || thisHasRight; newLineLeftBorder = misc::max (newLineLeftBorder, - oofm->getLeftBorder (this, y, height, this, - effOofRef)); + oofm->getLeftBorder (y, height, this, effOofRef)); newLineRightBorder = misc::max (newLineRightBorder, - oofm->getRightBorder (this, y, height, this, - effOofRef)); + oofm->getRightBorder (y, height, this, effOofRef)); // TODO "max" is not really correct for the heights. (Does // not matter, since only one, the float manager, returns @@ -2091,12 +2088,12 @@ void Textblock::calcBorders (int lastOofRef, int height) if (thisHasLeft) newLineLeftFloatHeight = misc::max (newLineLeftFloatHeight, - oofm->getLeftFloatHeight (this, y, height, this, + oofm->getLeftFloatHeight (y, height, this, effOofRef)); if (thisHasRight) newLineRightFloatHeight = misc::max (newLineRightFloatHeight, - oofm->getRightFloatHeight (this, y, height, this, + oofm->getRightFloatHeight (y, height, this, effOofRef)); DBG_OBJ_MSGF ("construct.line", 1, |